diff --git a/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/resolvers/graphql-query-find-many-resolver.service.ts b/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/resolvers/graphql-query-find-many-resolver.service.ts
index 7d7a7c86dc01..5058514708db 100644
--- a/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/resolvers/graphql-query-find-many-resolver.service.ts
+++ b/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/resolvers/graphql-query-find-many-resolver.service.ts
@@ -20,10 +20,8 @@ import { GraphqlQueryParser } from 'src/engine/api/graphql/graphql-query-runner/
 import { ObjectRecordsToGraphqlConnectionMapper } from 'src/engine/api/graphql/graphql-query-runner/orm-mappers/object-records-to-graphql-connection.mapper';
 import { applyRangeFilter } from 'src/engine/api/graphql/graphql-query-runner/utils/apply-range-filter.util';
 import { decodeCursor } from 'src/engine/api/graphql/graphql-query-runner/utils/cursors.util';
-import {
-  convertObjectMetadataToMap,
-  getObjectMetadata,
-} from 'src/engine/api/graphql/graphql-query-runner/utils/get-object-metadata.util';
+import { getObjectMetadata } from 'src/engine/api/graphql/graphql-query-runner/utils/get-object-metadata.util';
+import { generateObjectMetadataMap } from 'src/engine/metadata-modules/utils/generate-object-metadata-map.util';
 import { TwentyORMGlobalManager } from 'src/engine/twenty-orm/twenty-orm-global.manager';
 
 export class GraphqlQueryFindManyResolverService {
@@ -51,7 +49,7 @@ export class GraphqlQueryFindManyResolverService {
         authContext.workspace.id,
         objectMetadataItem.nameSingular,
       );
-    const objectMetadataMap = convertObjectMetadataToMap(
+    const objectMetadataMap = generateObjectMetadataMap(
       objectMetadataCollection,
     );
     const objectMetadata = getObjectMetadata(