Fix errors after upstream/main merge

hibernate-core/src/main/java/org/hibernate/engine/spi/SharedSessionContractImplementor.java

@@ -321,7 +321,7 @@ public interface SharedSessionContractImplementor
 
 	/**
 	 * Instantiate the entity class of an EntityPersister, initializing with the given identifier.
-	 * This is more efficient than {@link #instantiate(String, Serializable)} but not always
+	 * This is more efficient than {@link #instantiate(String, Object)} but not always
 	 * interchangeable: a single persister might be responsible for multiple types.
 	 */
 	Object instantiate(EntityPersister persister, Object id) throws HibernateException;

hibernate-core/src/main/java/org/hibernate/internal/StatelessSessionImpl.java

@@ -171,7 +171,7 @@ public class StatelessSessionImpl extends AbstractSharedSessionContract implemen
 		return get( getFactory().getMetamodel().entityPersister( entityName ), id, lockMode );
 	}
 
-	protected Object get(final EntityPersister ep, final Serializable id, final LockMode lockMode) {
+	protected Object get(final EntityPersister ep, final Object id, final LockMode lockMode) {
 		checkOpen();
 
 		Object result = ep.load( id, null, getNullSafeLockMode( lockMode ), this );