diff --git a/query-engine/dmmf/src/ast_builders/datamodel_ast_builder.rs b/query-engine/dmmf/src/ast_builders/datamodel_ast_builder.rs
index a0e120216073..0dbc00c1b39d 100644
--- a/query-engine/dmmf/src/ast_builders/datamodel_ast_builder.rs
+++ b/query-engine/dmmf/src/ast_builders/datamodel_ast_builder.rs
@@ -310,7 +310,7 @@ fn prisma_value_to_serde(value: &PrismaValue) -> serde_json::Value {
         PrismaValue::Float(val) => {
             serde_json::Value::Number(serde_json::Number::from_f64(val.to_f64().unwrap()).unwrap())
         }
-        PrismaValue::Int(val) => serde_json::Value::Number(serde_json::Number::from_f64(*val as f64).unwrap()),
+        PrismaValue::Int(val) => serde_json::Value::Number(serde_json::Number::from(*val)),
         PrismaValue::BigInt(val) => serde_json::Value::String(val.to_string()),
         PrismaValue::DateTime(val) => serde_json::Value::String(val.to_rfc3339()),
         PrismaValue::Null => serde_json::Value::Null,
diff --git a/query-engine/dmmf/src/tests/test-schemas/snapshots/odoo.snapshot.json.gz b/query-engine/dmmf/src/tests/test-schemas/snapshots/odoo.snapshot.json.gz
index 9190b3618205..7d1c94c67d19 100644
Binary files a/query-engine/dmmf/src/tests/test-schemas/snapshots/odoo.snapshot.json.gz and b/query-engine/dmmf/src/tests/test-schemas/snapshots/odoo.snapshot.json.gz differ
diff --git a/query-engine/dmmf/test_files/functions.json b/query-engine/dmmf/test_files/functions.json
index bdc394178a92..6bfa5f06e2e0 100644
--- a/query-engine/dmmf/test_files/functions.json
+++ b/query-engine/dmmf/test_files/functions.json
@@ -47,7 +47,9 @@
           "type": "String",
           "default": {
             "name": "cuid",
-            "args": []
+            "args": [
+              2
+            ]
           },
           "isGenerated": false,
           "isUpdatedAt": false
diff --git a/query-engine/query-structure/src/default_value.rs b/query-engine/query-structure/src/default_value.rs
index 63d2c37aa25c..d962b5916161 100644
--- a/query-engine/query-structure/src/default_value.rs
+++ b/query-engine/query-structure/src/default_value.rs
@@ -183,11 +183,19 @@ impl ValueGenerator {
     }
 
     pub fn new_cuid(version: u8) -> Self {
-        ValueGenerator::new(format!("cuid({version})"), vec![]).unwrap()
+        ValueGenerator::new(
+            format!("cuid"),
+            vec![(Some(format!("{version}")), PrismaValue::Int(version as i64))],
+        )
+        .unwrap()
     }
 
     pub fn new_uuid(version: u8) -> Self {
-        ValueGenerator::new(format!("uuid({version})"), vec![]).unwrap()
+        ValueGenerator::new(
+            format!("uuid"),
+            vec![(Some(format!("{version}")), PrismaValue::Int(version as i64))],
+        )
+        .unwrap()
     }
 
     pub fn new_nanoid(length: Option<u8>) -> Self {