diff --git a/.changeset/silly-waves-add.md b/.changeset/silly-waves-add.md
new file mode 100644
index 0000000000..7fad40b649
--- /dev/null
+++ b/.changeset/silly-waves-add.md
@@ -0,0 +1,5 @@
+---
+"@medusajs/locking-postgres": patch
+---
+
+chore: locking-postgres provider to DML
diff --git a/packages/core/modules-sdk/src/remote-query/__fixtures__/remote-query-type.ts b/packages/core/modules-sdk/src/remote-query/__fixtures__/remote-query-type.ts
index 43d66a6750..a4889a5e30 100644
--- a/packages/core/modules-sdk/src/remote-query/__fixtures__/remote-query-type.ts
+++ b/packages/core/modules-sdk/src/remote-query/__fixtures__/remote-query-type.ts
@@ -18,7 +18,6 @@ export type Incremental<T> =
   | {
       [P in keyof T]?: P extends " $fragmentName" | "__typename" ? T[P] : never
     }
-
 /** All built-in and custom scalars, mapped to their actual values */
 export type Scalars = {
   ID: { input: string; output: string }
@@ -33,232 +32,232 @@ export type Scalars = {
 export type SimpleProduct = {
   id: Scalars["ID"]["output"]
   handle: string
-  title?: Scalars["String"]["output"]
-  variants?: Maybe<Array<Maybe<Pick<ProductVariant, "id">>>>
-  sales_channels_link?: Array<
+  title: Scalars["String"]["output"]
+  variants: Maybe<Array<Maybe<Pick<ProductVariant, "id">>>>
+  sales_channels_link: Array<
     Pick<LinkProductSalesChannel, "product_id" | "sales_channel_id">
   >
-  sales_channels?: Array<Pick<SalesChannel, "id" | "name">>
+  sales_channels: Array<Pick<SalesChannel, "id" | "name">>
 }
 
 export type Product = {
-  __typename?: "Product"
+  __typename: "Product"
   id: Scalars["ID"]["output"]
   handle: Scalars["String"]["output"]
   title: Scalars["String"]["output"]
-  description?: Scalars["String"]["output"]
-  variants?: Array<ProductVariant>
-  sales_channels_link?: Array<LinkProductSalesChannel>
-  sales_channels?: Array<SalesChannel>
-  metadata?: Maybe<Scalars["JSON"]["output"]>
-  translation?: Maybe<ProductTranslation>
-  categories?: Array<ProductCategory>
+  description: Scalars["String"]["output"]
+  variants: Array<ProductVariant>
+  sales_channels_link: Array<LinkProductSalesChannel>
+  sales_channels: Array<SalesChannel>
+  metadata: Maybe<Scalars["JSON"]["output"]>
+  translation: Maybe<ProductTranslation>
+  categories: Array<ProductCategory>
 }
 
 export type ProductTranslation = {
-  __typename?: "ProductTranslation"
+  __typename: "ProductTranslation"
   id: Scalars["ID"]["output"]
   title: Scalars["String"]["output"]
   description: Scalars["String"]["output"]
-  product?: Maybe<Product>
+  product: Maybe<Product>
 }
 
 export type ProductVariant = {
-  __typename?: "ProductVariant"
+  __typename: "ProductVariant"
   id: Scalars["ID"]["output"]
   handle: Scalars["String"]["output"]
   title: Scalars["String"]["output"]
   sku: Scalars["String"]["output"]
-  product?: Maybe<Product>
-  calculated_price?: Maybe<Scalars["JSON"]["output"]>
-  translation?: Maybe<ProductVariantTranslation>
+  product: Maybe<Product>
+  calculated_price: Maybe<Scalars["JSON"]["output"]>
+  translation: Maybe<ProductVariantTranslation>
 }
 
 export type ProductVariantTranslation = {
-  __typename?: "ProductVariantTranslation"
+  __typename: "ProductVariantTranslation"
   id: Scalars["ID"]["output"]
   title: Scalars["String"]["output"]
   description: Scalars["String"]["output"]
-  variant?: Maybe<ProductVariant>
+  variant: Maybe<ProductVariant>
 }
 
 export type ProductCategory = {
-  __typename?: "ProductCategory"
+  __typename: "ProductCategory"
   id: Scalars["ID"]["output"]
   handle: Scalars["String"]["output"]
-  title?: Maybe<Scalars["String"]["output"]>
-  translation?: Maybe<ProductCategoryTranslation>
+  title: Maybe<Scalars["String"]["output"]>
+  translation: Maybe<ProductCategoryTranslation>
 }
 
 export type ProductCategoryTranslation = {
-  __typename?: "ProductCategoryTranslation"
+  __typename: "ProductCategoryTranslation"
   id: Scalars["ID"]["output"]
   title: Scalars["String"]["output"]
   description: Scalars["String"]["output"]
-  category?: Maybe<ProductCategory>
+  category: Maybe<ProductCategory>
 }
 
 export type SalesChannel = {
-  __typename?: "SalesChannel"
+  __typename: "SalesChannel"
   id: Scalars["ID"]["output"]
-  name?: Maybe<Scalars["String"]["output"]>
-  description?: Maybe<Scalars["String"]["output"]>
-  created_at?: Maybe<Scalars["DateTime"]["output"]>
-  updated_at?: Maybe<Scalars["DateTime"]["output"]>
-  products_link?: Maybe<Array<Maybe<LinkProductSalesChannel>>>
-  api_keys_link?: Maybe<Array<Maybe<LinkPublishableApiKeySalesChannel>>>
-  locations_link?: Maybe<Array<Maybe<LinkSalesChannelStockLocation>>>
+  name: Maybe<Scalars["String"]["output"]>
+  description: Maybe<Scalars["String"]["output"]>
+  created_at: Maybe<Scalars["DateTime"]["output"]>
+  updated_at: Maybe<Scalars["DateTime"]["output"]>
+  products_link: Maybe<Array<Maybe<LinkProductSalesChannel>>>
+  api_keys_link: Maybe<Array<Maybe<LinkPublishableApiKeySalesChannel>>>
+  locations_link: Maybe<Array<Maybe<LinkSalesChannelStockLocation>>>
 }
 
 export type LinkCartPaymentCollection = {
-  __typename?: "LinkCartPaymentCollection"
+  __typename: "LinkCartPaymentCollection"
   cart_id: Scalars["String"]["output"]
   payment_collection_id: Scalars["String"]["output"]
   createdAt: Scalars["String"]["output"]
   updatedAt: Scalars["String"]["output"]
-  deletedAt?: Maybe<Scalars["String"]["output"]>
+  deletedAt: Maybe<Scalars["String"]["output"]>
 }
 
 export type LinkCartPromotion = {
-  __typename?: "LinkCartPromotion"
+  __typename: "LinkCartPromotion"
   cart_id: Scalars["String"]["output"]
   promotion_id: Scalars["String"]["output"]
   createdAt: Scalars["String"]["output"]
   updatedAt: Scalars["String"]["output"]
-  deletedAt?: Maybe<Scalars["String"]["output"]>
+  deletedAt: Maybe<Scalars["String"]["output"]>
 }
 
 export type LinkLocationFulfillmentProvider = {
-  __typename?: "LinkLocationFulfillmentProvider"
+  __typename: "LinkLocationFulfillmentProvider"
   stock_location_id: Scalars["String"]["output"]
   fulfillment_provider_id: Scalars["String"]["output"]
   createdAt: Scalars["String"]["output"]
   updatedAt: Scalars["String"]["output"]
-  deletedAt?: Maybe<Scalars["String"]["output"]>
+  deletedAt: Maybe<Scalars["String"]["output"]>
 }
 
 export type LinkLocationFulfillmentSet = {
-  __typename?: "LinkLocationFulfillmentSet"
+  __typename: "LinkLocationFulfillmentSet"
   stock_location_id: Scalars["String"]["output"]
   fulfillment_set_id: Scalars["String"]["output"]
   createdAt: Scalars["String"]["output"]
   updatedAt: Scalars["String"]["output"]
-  deletedAt?: Maybe<Scalars["String"]["output"]>
+  deletedAt: Maybe<Scalars["String"]["output"]>
 }
 
 export type LinkOrderCart = {
-  __typename?: "LinkOrderCart"
+  __typename: "LinkOrderCart"
   order_id: Scalars["String"]["output"]
   cart_id: Scalars["String"]["output"]
   createdAt: Scalars["String"]["output"]
   updatedAt: Scalars["String"]["output"]
-  deletedAt?: Maybe<Scalars["String"]["output"]>
+  deletedAt: Maybe<Scalars["String"]["output"]>
 }
 
 export type LinkOrderFulfillment = {
-  __typename?: "LinkOrderFulfillment"
+  __typename: "LinkOrderFulfillment"
   order_id: Scalars["String"]["output"]
   fulfillment_id: Scalars["String"]["output"]
   createdAt: Scalars["String"]["output"]
   updatedAt: Scalars["String"]["output"]
-  deletedAt?: Maybe<Scalars["String"]["output"]>
+  deletedAt: Maybe<Scalars["String"]["output"]>
 }
 
 export type LinkOrderPaymentCollection = {
-  __typename?: "LinkOrderPaymentCollection"
+  __typename: "LinkOrderPaymentCollection"
   order_id: Scalars["String"]["output"]
   payment_collection_id: Scalars["String"]["output"]
   createdAt: Scalars["String"]["output"]
   updatedAt: Scalars["String"]["output"]
-  deletedAt?: Maybe<Scalars["String"]["output"]>
+  deletedAt: Maybe<Scalars["String"]["output"]>
 }
 
 export type LinkOrderPromotion = {
-  __typename?: "LinkOrderPromotion"
+  __typename: "LinkOrderPromotion"
   order_id: Scalars["String"]["output"]
   promotion_id: Scalars["String"]["output"]
   createdAt: Scalars["String"]["output"]
   updatedAt: Scalars["String"]["output"]
-  deletedAt?: Maybe<Scalars["String"]["output"]>
+  deletedAt: Maybe<Scalars["String"]["output"]>
 }
 
 export type LinkReturnFulfillment = {
-  __typename?: "LinkReturnFulfillment"
+  __typename: "LinkReturnFulfillment"
   return_id: Scalars["String"]["output"]
   fulfillment_id: Scalars["String"]["output"]
   createdAt: Scalars["String"]["output"]
   updatedAt: Scalars["String"]["output"]
-  deletedAt?: Maybe<Scalars["String"]["output"]>
+  deletedAt: Maybe<Scalars["String"]["output"]>
 }
 
 export type LinkProductSalesChannel = {
-  __typename?: "LinkProductSalesChannel"
+  __typename: "LinkProductSalesChannel"
   product_id: Scalars["String"]["output"]
   sales_channel_id: Scalars["String"]["output"]
-  product?: Maybe<Product>
-  sales_channel?: Maybe<SalesChannel>
+  product: Maybe<Product>
+  sales_channel: Maybe<SalesChannel>
   createdAt: Scalars["String"]["output"]
   updatedAt: Scalars["String"]["output"]
-  deletedAt?: Maybe<Scalars["String"]["output"]>
+  deletedAt: Maybe<Scalars["String"]["output"]>
 }
 
 export type LinkProductVariantInventoryItem = {
-  __typename?: "LinkProductVariantInventoryItem"
+  __typename: "LinkProductVariantInventoryItem"
   variant_id: Scalars["String"]["output"]
   inventory_item_id: Scalars["String"]["output"]
   required_quantity: Scalars["Int"]["output"]
-  variant?: Maybe<Product>
+  variant: Maybe<Product>
   createdAt: Scalars["String"]["output"]
   updatedAt: Scalars["String"]["output"]
-  deletedAt?: Maybe<Scalars["String"]["output"]>
+  deletedAt: Maybe<Scalars["String"]["output"]>
 }
 
 export type LinkProductVariantPriceSet = {
-  __typename?: "LinkProductVariantPriceSet"
+  __typename: "LinkProductVariantPriceSet"
   variant_id: Scalars["String"]["output"]
   price_set_id: Scalars["String"]["output"]
-  variant?: Maybe<Product>
+  variant: Maybe<Product>
   createdAt: Scalars["String"]["output"]
   updatedAt: Scalars["String"]["output"]
-  deletedAt?: Maybe<Scalars["String"]["output"]>
+  deletedAt: Maybe<Scalars["String"]["output"]>
 }
 
 export type LinkPublishableApiKeySalesChannel = {
-  __typename?: "LinkPublishableApiKeySalesChannel"
+  __typename: "LinkPublishableApiKeySalesChannel"
   publishable_key_id: Scalars["String"]["output"]
   sales_channel_id: Scalars["String"]["output"]
-  sales_channel?: Maybe<SalesChannel>
+  sales_channel: Maybe<SalesChannel>
   createdAt: Scalars["String"]["output"]
   updatedAt: Scalars["String"]["output"]
-  deletedAt?: Maybe<Scalars["String"]["output"]>
+  deletedAt: Maybe<Scalars["String"]["output"]>
 }
 
 export type LinkRegionPaymentProvider = {
-  __typename?: "LinkRegionPaymentProvider"
+  __typename: "LinkRegionPaymentProvider"
   region_id: Scalars["String"]["output"]
   payment_provider_id: Scalars["String"]["output"]
   createdAt: Scalars["String"]["output"]
   updatedAt: Scalars["String"]["output"]
-  deletedAt?: Maybe<Scalars["String"]["output"]>
+  deletedAt: Maybe<Scalars["String"]["output"]>
 }
 
 export type LinkSalesChannelStockLocation = {
-  __typename?: "LinkSalesChannelStockLocation"
+  __typename: "LinkSalesChannelStockLocation"
   sales_channel_id: Scalars["String"]["output"]
   stock_location_id: Scalars["String"]["output"]
-  sales_channel?: Maybe<SalesChannel>
+  sales_channel: Maybe<SalesChannel>
   createdAt: Scalars["String"]["output"]
   updatedAt: Scalars["String"]["output"]
-  deletedAt?: Maybe<Scalars["String"]["output"]>
+  deletedAt: Maybe<Scalars["String"]["output"]>
 }
 
 export type LinkShippingOptionPriceSet = {
-  __typename?: "LinkShippingOptionPriceSet"
+  __typename: "LinkShippingOptionPriceSet"
   shipping_option_id: Scalars["String"]["output"]
   price_set_id: Scalars["String"]["output"]
   createdAt: Scalars["String"]["output"]
   updatedAt: Scalars["String"]["output"]
-  deletedAt?: Maybe<Scalars["String"]["output"]>
+  deletedAt: Maybe<Scalars["String"]["output"]>
 }
 
 export interface FixtureEntryPoints {
diff --git a/packages/core/types/src/index-data/__fixtures__/index-service-entry-points.ts b/packages/core/types/src/index-data/__fixtures__/index-service-entry-points.ts
index 42aec29043..d4e469b903 100644
--- a/packages/core/types/src/index-data/__fixtures__/index-service-entry-points.ts
+++ b/packages/core/types/src/index-data/__fixtures__/index-service-entry-points.ts
@@ -28,23 +28,23 @@ export type Scalars = {
 }
 
 export type Product = {
-  __typename?: "Product"
-  id?: Maybe<Scalars["String"]["output"]>
-  title?: Maybe<Scalars["String"]["output"]>
-  variants?: Maybe<Array<Maybe<ProductVariant>>>
+  __typename: "Product"
+  id: Maybe<Scalars["String"]["output"]>
+  title: Maybe<Scalars["String"]["output"]>
+  variants: Maybe<Array<Maybe<ProductVariant>>>
 }
 
 export type ProductVariant = {
-  __typename?: "ProductVariant"
-  id?: Maybe<Scalars["String"]["output"]>
-  product_id?: Maybe<Scalars["String"]["output"]>
-  sku?: Maybe<Scalars["String"]["output"]>
-  prices?: Maybe<Array<Maybe<Price>>>
+  __typename: "ProductVariant"
+  id: Maybe<Scalars["String"]["output"]>
+  product_id: Maybe<Scalars["String"]["output"]>
+  sku: Maybe<Scalars["String"]["output"]>
+  prices: Maybe<Array<Maybe<Price>>>
 }
 
 export type Price = {
-  __typename?: "Price"
-  amount?: Maybe<Scalars["Int"]["output"]>
+  __typename: "Price"
+  amount: Maybe<Scalars["Int"]["output"]>
 }
 
 export interface FixtureEntryPoints {
diff --git a/packages/core/types/src/modules-sdk/__fixtures__/remote-query.ts b/packages/core/types/src/modules-sdk/__fixtures__/remote-query.ts
index 5169ee35fb..8902a41d83 100644
--- a/packages/core/types/src/modules-sdk/__fixtures__/remote-query.ts
+++ b/packages/core/types/src/modules-sdk/__fixtures__/remote-query.ts
@@ -31,207 +31,207 @@ export type Scalars = {
 }
 
 export type SimpleProduct = {
-  __typename?: "SimpleProduct"
+  __typename: "SimpleProduct"
   id: Scalars["ID"]["output"]
   handle: string
-  title?: Scalars["String"]["output"]
-  variants?: Maybe<Array<Maybe<Pick<ProductVariant, "id" | "__typename">>>>
-  sales_channels_link?: Array<
+  title: Scalars["String"]["output"]
+  variants: Maybe<Array<Maybe<Pick<ProductVariant, "id" | "__typename">>>>
+  sales_channels_link: Array<
     Pick<
       LinkProductSalesChannel,
       "product_id" | "sales_channel_id" | "__typename"
     >
   >
-  sales_channels?: Array<Pick<SalesChannel, "id" | "name" | "__typename">>
+  sales_channels: Array<Pick<SalesChannel, "id" | "name" | "__typename">>
 }
 
 export type Product = {
-  __typename?: "Product"
+  __typename: "Product"
   id: Scalars["ID"]["output"]
   handle: Scalars["String"]["output"]
   title: Scalars["String"]["output"]
-  description?: Scalars["String"]["output"]
-  variants?: Array<ProductVariant>
-  sales_channels_link?: Array<LinkProductSalesChannel>
-  sales_channels?: Array<SalesChannel>
+  description: Scalars["String"]["output"]
+  variants: Array<ProductVariant>
+  sales_channels_link: Array<LinkProductSalesChannel>
+  sales_channels: Array<SalesChannel>
 }
 
 export type ProductVariant = {
-  __typename?: "ProductVariant"
+  __typename: "ProductVariant"
   id: Scalars["ID"]["output"]
   handle: Scalars["String"]["output"]
   title: Scalars["String"]["output"]
-  product?: Maybe<Product>
+  product: Maybe<Product>
 }
 
 export type ProductCategory = {
-  __typename?: "ProductCategory"
+  __typename: "ProductCategory"
   id: Scalars["ID"]["output"]
   handle: Scalars["String"]["output"]
-  title?: Maybe<Scalars["String"]["output"]>
+  title: Maybe<Scalars["String"]["output"]>
 }
 
 export type SalesChannel = {
-  __typename?: "SalesChannel"
+  __typename: "SalesChannel"
   id: Scalars["ID"]["output"]
-  name?: Maybe<Scalars["String"]["output"]>
-  description?: Maybe<Scalars["String"]["output"]>
-  created_at?: Maybe<Scalars["DateTime"]["output"]>
-  updated_at?: Maybe<Scalars["DateTime"]["output"]>
-  products_link?: Maybe<Array<Maybe<LinkProductSalesChannel>>>
-  api_keys_link?: Maybe<Array<Maybe<LinkPublishableApiKeySalesChannel>>>
-  locations_link?: Maybe<Array<Maybe<LinkSalesChannelStockLocation>>>
+  name: Maybe<Scalars["String"]["output"]>
+  description: Maybe<Scalars["String"]["output"]>
+  created_at: Maybe<Scalars["DateTime"]["output"]>
+  updated_at: Maybe<Scalars["DateTime"]["output"]>
+  products_link: Maybe<Array<Maybe<LinkProductSalesChannel>>>
+  api_keys_link: Maybe<Array<Maybe<LinkPublishableApiKeySalesChannel>>>
+  locations_link: Maybe<Array<Maybe<LinkSalesChannelStockLocation>>>
 }
 
 export type LinkCartPaymentCollection = {
-  __typename?: "LinkCartPaymentCollection"
+  __typename: "LinkCartPaymentCollection"
   cart_id: Scalars["String"]["output"]
   payment_collection_id: Scalars["String"]["output"]
   createdAt: Scalars["String"]["output"]
   updatedAt: Scalars["String"]["output"]
-  deletedAt?: Maybe<Scalars["String"]["output"]>
+  deletedAt: Maybe<Scalars["String"]["output"]>
 }
 
 export type LinkCartPromotion = {
-  __typename?: "LinkCartPromotion"
+  __typename: "LinkCartPromotion"
   cart_id: Scalars["String"]["output"]
   promotion_id: Scalars["String"]["output"]
   createdAt: Scalars["String"]["output"]
   updatedAt: Scalars["String"]["output"]
-  deletedAt?: Maybe<Scalars["String"]["output"]>
+  deletedAt: Maybe<Scalars["String"]["output"]>
 }
 
 export type LinkLocationFulfillmentProvider = {
-  __typename?: "LinkLocationFulfillmentProvider"
+  __typename: "LinkLocationFulfillmentProvider"
   stock_location_id: Scalars["String"]["output"]
   fulfillment_provider_id: Scalars["String"]["output"]
   createdAt: Scalars["String"]["output"]
   updatedAt: Scalars["String"]["output"]
-  deletedAt?: Maybe<Scalars["String"]["output"]>
+  deletedAt: Maybe<Scalars["String"]["output"]>
 }
 
 export type LinkLocationFulfillmentSet = {
-  __typename?: "LinkLocationFulfillmentSet"
+  __typename: "LinkLocationFulfillmentSet"
   stock_location_id: Scalars["String"]["output"]
   fulfillment_set_id: Scalars["String"]["output"]
   createdAt: Scalars["String"]["output"]
   updatedAt: Scalars["String"]["output"]
-  deletedAt?: Maybe<Scalars["String"]["output"]>
+  deletedAt: Maybe<Scalars["String"]["output"]>
 }
 
 export type LinkOrderCart = {
-  __typename?: "LinkOrderCart"
+  __typename: "LinkOrderCart"
   order_id: Scalars["String"]["output"]
   cart_id: Scalars["String"]["output"]
   createdAt: Scalars["String"]["output"]
   updatedAt: Scalars["String"]["output"]
-  deletedAt?: Maybe<Scalars["String"]["output"]>
+  deletedAt: Maybe<Scalars["String"]["output"]>
 }
 
 export type LinkOrderFulfillment = {
-  __typename?: "LinkOrderFulfillment"
+  __typename: "LinkOrderFulfillment"
   order_id: Scalars["String"]["output"]
   fulfillment_id: Scalars["String"]["output"]
   createdAt: Scalars["String"]["output"]
   updatedAt: Scalars["String"]["output"]
-  deletedAt?: Maybe<Scalars["String"]["output"]>
+  deletedAt: Maybe<Scalars["String"]["output"]>
 }
 
 export type LinkOrderPaymentCollection = {
-  __typename?: "LinkOrderPaymentCollection"
+  __typename: "LinkOrderPaymentCollection"
   order_id: Scalars["String"]["output"]
   payment_collection_id: Scalars["String"]["output"]
   createdAt: Scalars["String"]["output"]
   updatedAt: Scalars["String"]["output"]
-  deletedAt?: Maybe<Scalars["String"]["output"]>
+  deletedAt: Maybe<Scalars["String"]["output"]>
 }
 
 export type LinkOrderPromotion = {
-  __typename?: "LinkOrderPromotion"
+  __typename: "LinkOrderPromotion"
   order_id: Scalars["String"]["output"]
   promotion_id: Scalars["String"]["output"]
   createdAt: Scalars["String"]["output"]
   updatedAt: Scalars["String"]["output"]
-  deletedAt?: Maybe<Scalars["String"]["output"]>
+  deletedAt: Maybe<Scalars["String"]["output"]>
 }
 
 export type LinkReturnFulfillment = {
-  __typename?: "LinkReturnFulfillment"
+  __typename: "LinkReturnFulfillment"
   return_id: Scalars["String"]["output"]
   fulfillment_id: Scalars["String"]["output"]
   createdAt: Scalars["String"]["output"]
   updatedAt: Scalars["String"]["output"]
-  deletedAt?: Maybe<Scalars["String"]["output"]>
+  deletedAt: Maybe<Scalars["String"]["output"]>
 }
 
 export type LinkProductSalesChannel = {
-  __typename?: "LinkProductSalesChannel"
+  __typename: "LinkProductSalesChannel"
   product_id: Scalars["String"]["output"]
   sales_channel_id: Scalars["String"]["output"]
-  product?: Maybe<Product>
-  sales_channel?: Maybe<SalesChannel>
+  product: Maybe<Product>
+  sales_channel: Maybe<SalesChannel>
   createdAt: Scalars["String"]["output"]
   updatedAt: Scalars["String"]["output"]
-  deletedAt?: Maybe<Scalars["String"]["output"]>
+  deletedAt: Maybe<Scalars["String"]["output"]>
 }
 
 export type LinkProductVariantInventoryItem = {
-  __typename?: "LinkProductVariantInventoryItem"
+  __typename: "LinkProductVariantInventoryItem"
   variant_id: Scalars["String"]["output"]
   inventory_item_id: Scalars["String"]["output"]
   required_quantity: Scalars["Int"]["output"]
-  variant?: Maybe<Product>
+  variant: Maybe<Product>
   createdAt: Scalars["String"]["output"]
   updatedAt: Scalars["String"]["output"]
-  deletedAt?: Maybe<Scalars["String"]["output"]>
+  deletedAt: Maybe<Scalars["String"]["output"]>
 }
 
 export type LinkProductVariantPriceSet = {
-  __typename?: "LinkProductVariantPriceSet"
+  __typename: "LinkProductVariantPriceSet"
   variant_id: Scalars["String"]["output"]
   price_set_id: Scalars["String"]["output"]
-  variant?: Maybe<Product>
+  variant: Maybe<Product>
   createdAt: Scalars["String"]["output"]
   updatedAt: Scalars["String"]["output"]
-  deletedAt?: Maybe<Scalars["String"]["output"]>
+  deletedAt: Maybe<Scalars["String"]["output"]>
 }
 
 export type LinkPublishableApiKeySalesChannel = {
-  __typename?: "LinkPublishableApiKeySalesChannel"
+  __typename: "LinkPublishableApiKeySalesChannel"
   publishable_key_id: Scalars["String"]["output"]
   sales_channel_id: Scalars["String"]["output"]
-  sales_channel?: Maybe<SalesChannel>
+  sales_channel: Maybe<SalesChannel>
   createdAt: Scalars["String"]["output"]
   updatedAt: Scalars["String"]["output"]
-  deletedAt?: Maybe<Scalars["String"]["output"]>
+  deletedAt: Maybe<Scalars["String"]["output"]>
 }
 
 export type LinkRegionPaymentProvider = {
-  __typename?: "LinkRegionPaymentProvider"
+  __typename: "LinkRegionPaymentProvider"
   region_id: Scalars["String"]["output"]
   payment_provider_id: Scalars["String"]["output"]
   createdAt: Scalars["String"]["output"]
   updatedAt: Scalars["String"]["output"]
-  deletedAt?: Maybe<Scalars["String"]["output"]>
+  deletedAt: Maybe<Scalars["String"]["output"]>
 }
 
 export type LinkSalesChannelStockLocation = {
-  __typename?: "LinkSalesChannelStockLocation"
+  __typename: "LinkSalesChannelStockLocation"
   sales_channel_id: Scalars["String"]["output"]
   stock_location_id: Scalars["String"]["output"]
-  sales_channel?: Maybe<SalesChannel>
+  sales_channel: Maybe<SalesChannel>
   createdAt: Scalars["String"]["output"]
   updatedAt: Scalars["String"]["output"]
-  deletedAt?: Maybe<Scalars["String"]["output"]>
+  deletedAt: Maybe<Scalars["String"]["output"]>
 }
 
 export type LinkShippingOptionPriceSet = {
-  __typename?: "LinkShippingOptionPriceSet"
+  __typename: "LinkShippingOptionPriceSet"
   shipping_option_id: Scalars["String"]["output"]
   price_set_id: Scalars["String"]["output"]
   createdAt: Scalars["String"]["output"]
   updatedAt: Scalars["String"]["output"]
-  deletedAt?: Maybe<Scalars["String"]["output"]>
+  deletedAt: Maybe<Scalars["String"]["output"]>
 }
 
 export interface FixtureEntryPoints {
diff --git a/packages/modules/providers/locking-postgres/src/models/locking.ts b/packages/modules/providers/locking-postgres/src/models/locking.ts
index 8b9558befb..8868dec653 100644
--- a/packages/modules/providers/locking-postgres/src/models/locking.ts
+++ b/packages/modules/providers/locking-postgres/src/models/locking.ts
@@ -1,32 +1,9 @@
-import { generateEntityId } from "@medusajs/framework/utils"
-import {
-  BeforeCreate,
-  Entity,
-  OnInit,
-  PrimaryKey,
-  Property,
-} from "@mikro-orm/core"
+import { model } from "@medusajs/framework/utils"
 
-@Entity({ tableName: "locking" })
-class Locking {
-  @PrimaryKey({ columnType: "text" })
-  id!: string
-
-  @Property({ columnType: "text", nullable: true })
-  owner_id: string | null = null
-
-  @Property({ columnType: "timestamptz", nullable: true })
-  expiration: Date | null = null
-
-  @BeforeCreate()
-  onCreate() {
-    this.id = generateEntityId(this.id, "lk")
-  }
-
-  @OnInit()
-  onInit() {
-    this.id = generateEntityId(this.id, "lk")
-  }
-}
+const Locking = model.define("Locking", {
+  id: model.id({ prefix: "lk" }).primaryKey(),
+  owner_id: model.text().nullable(),
+  expiration: model.dateTime().nullable(),
+})
 
 export default Locking