diff --git a/crates/sui-graphql-e2e-tests/tests/objects/enum_data.exp b/crates/sui-graphql-e2e-tests/tests/objects/enum_data.exp
index 11db5c57d3e05..7b0d472906fc6 100644
--- a/crates/sui-graphql-e2e-tests/tests/objects/enum_data.exp
+++ b/crates/sui-graphql-e2e-tests/tests/objects/enum_data.exp
@@ -30,7 +30,7 @@ Response: {
                     "asMoveObject": {
                       "contents": {
                         "type": {
-                          "repr": "0x2b27451fe08307117ecc1d172f7bb24b81bfdb774592d8d11ba196a76edaddd6::m::Foo"
+                          "repr": "0xc6c3c93403b514bc534bb5eb5f18ad994caa414f6d178d3c71ef677f343fed7f::m::Foo"
                         },
                         "data": {
                           "Struct": [
@@ -38,38 +38,38 @@ Response: {
                               "name": "id",
                               "value": {
                                 "UID": [
-                                  56,
-                                  223,
-                                  62,
-                                  4,
-                                  221,
-                                  43,
-                                  163,
-                                  179,
-                                  9,
-                                  17,
-                                  185,
-                                  146,
-                                  193,
-                                  146,
-                                  56,
-                                  28,
-                                  179,
-                                  90,
-                                  243,
+                                  38,
+                                  208,
+                                  191,
+                                  88,
+                                  204,
+                                  210,
+                                  143,
+                                  164,
+                                  241,
                                   178,
-                                  100,
-                                  107,
-                                  65,
-                                  162,
-                                  152,
-                                  189,
-                                  57,
-                                  216,
-                                  209,
+                                  35,
                                   61,
-                                  42,
-                                  215
+                                  136,
+                                  222,
+                                  125,
+                                  75,
+                                  118,
+                                  15,
+                                  229,
+                                  217,
+                                  229,
+                                  13,
+                                  97,
+                                  94,
+                                  19,
+                                  200,
+                                  52,
+                                  115,
+                                  126,
+                                  208,
+                                  219,
+                                  38
                                 ]
                               }
                             },
@@ -77,38 +77,38 @@ Response: {
                               "name": "f0",
                               "value": {
                                 "ID": [
-                                  56,
-                                  223,
-                                  62,
-                                  4,
-                                  221,
-                                  43,
-                                  163,
-                                  179,
-                                  9,
-                                  17,
-                                  185,
-                                  146,
-                                  193,
-                                  146,
-                                  56,
-                                  28,
-                                  179,
-                                  90,
-                                  243,
+                                  38,
+                                  208,
+                                  191,
+                                  88,
+                                  204,
+                                  210,
+                                  143,
+                                  164,
+                                  241,
                                   178,
-                                  100,
-                                  107,
-                                  65,
-                                  162,
-                                  152,
-                                  189,
-                                  57,
-                                  216,
-                                  209,
+                                  35,
                                   61,
-                                  42,
-                                  215
+                                  136,
+                                  222,
+                                  125,
+                                  75,
+                                  118,
+                                  15,
+                                  229,
+                                  217,
+                                  229,
+                                  13,
+                                  97,
+                                  94,
+                                  19,
+                                  200,
+                                  52,
+                                  115,
+                                  126,
+                                  208,
+                                  219,
+                                  38
                                 ]
                               }
                             },
@@ -148,38 +148,38 @@ Response: {
                                 "Vector": [
                                   {
                                     "Address": [
-                                      56,
-                                      223,
-                                      62,
-                                      4,
-                                      221,
-                                      43,
-                                      163,
-                                      179,
-                                      9,
-                                      17,
-                                      185,
-                                      146,
-                                      193,
-                                      146,
-                                      56,
-                                      28,
-                                      179,
-                                      90,
-                                      243,
+                                      38,
+                                      208,
+                                      191,
+                                      88,
+                                      204,
+                                      210,
+                                      143,
+                                      164,
+                                      241,
                                       178,
-                                      100,
-                                      107,
-                                      65,
-                                      162,
-                                      152,
-                                      189,
-                                      57,
-                                      216,
-                                      209,
+                                      35,
                                       61,
-                                      42,
-                                      215
+                                      136,
+                                      222,
+                                      125,
+                                      75,
+                                      118,
+                                      15,
+                                      229,
+                                      217,
+                                      229,
+                                      13,
+                                      97,
+                                      94,
+                                      19,
+                                      200,
+                                      52,
+                                      115,
+                                      126,
+                                      208,
+                                      219,
+                                      38
                                     ]
                                   }
                                 ]
@@ -246,15 +246,15 @@ Response: {
                           ]
                         },
                         "json": {
-                          "id": "0x38df3e04dd2ba3b30911b992c192381cb35af3b2646b41a298bd39d8d13d2ad7",
-                          "f0": "0x38df3e04dd2ba3b30911b992c192381cb35af3b2646b41a298bd39d8d13d2ad7",
+                          "id": "0x26d0bf58ccd28fa4f1b2233d88de7d4b760fe5d9e50d615e13c834737ed0db26",
+                          "f0": "0x26d0bf58ccd28fa4f1b2233d88de7d4b760fe5d9e50d615e13c834737ed0db26",
                           "f1": true,
                           "f2": 42,
                           "f3": "43",
                           "f4": "hello",
                           "f5": "world",
                           "f6": [
-                            "0x38df3e04dd2ba3b30911b992c192381cb35af3b2646b41a298bd39d8d13d2ad7"
+                            "0x26d0bf58ccd28fa4f1b2233d88de7d4b760fe5d9e50d615e13c834737ed0db26"
                           ],
                           "f7": 44,
                           "f8": {
@@ -291,38 +291,38 @@ Response: {
                               "name": "id",
                               "value": {
                                 "UID": [
-                                  74,
-                                  63,
-                                  69,
-                                  149,
-                                  223,
-                                  0,
-                                  225,
-                                  254,
-                                  133,
-                                  114,
-                                  233,
-                                  29,
-                                  11,
-                                  223,
-                                  12,
-                                  229,
-                                  83,
-                                  83,
-                                  236,
-                                  108,
+                                  242,
+                                  188,
+                                  8,
+                                  146,
+                                  91,
+                                  93,
+                                  199,
+                                  88,
+                                  48,
+                                  87,
+                                  226,
+                                  103,
+                                  228,
+                                  118,
+                                  197,
+                                  119,
+                                  77,
+                                  235,
+                                  253,
+                                  112,
+                                  65,
                                   28,
-                                  82,
                                   187,
-                                  116,
-                                  23,
-                                  108,
-                                  228,
-                                  45,
-                                  4,
-                                  45,
-                                  150,
-                                  20
+                                  56,
+                                  82,
+                                  102,
+                                  118,
+                                  60,
+                                  147,
+                                  142,
+                                  46,
+                                  97
                                 ]
                               }
                             },
@@ -342,7 +342,7 @@ Response: {
                           ]
                         },
                         "json": {
-                          "id": "0x4a3f4595df00e1fe8572e91d0bdf0ce55353ec6c1c52bb74176ce42d042d9614",
+                          "id": "0xf2bc08925b5dc7583057e267e476c5774debfd70411cbb385266763c938e2e61",
                           "balance": {
                             "value": "299999995967600"
                           }
diff --git a/crates/sui-graphql-e2e-tests/tests/packages/datatypes.exp b/crates/sui-graphql-e2e-tests/tests/packages/datatypes.exp
index e022382e6ee45..d2bbe304fc3fd 100644
--- a/crates/sui-graphql-e2e-tests/tests/packages/datatypes.exp
+++ b/crates/sui-graphql-e2e-tests/tests/packages/datatypes.exp
@@ -150,7 +150,7 @@ task 5 'run-graphql'. lines 72-96:
 Response: {
   "data": {
     "object": {
-      "address": "0x4ad90f4ed98d545600c66a80334410db765366c41e8e716766bd72822a77500d",
+      "address": "0x0a95d2ec15ae1074b8a4ab8707a4525292cc69047ad4c4a98d6482e751f9d278",
       "asMovePackage": {
         "module": {
           "datatypes": {
@@ -184,7 +184,7 @@ task 6 'run-graphql'. lines 98-143:
 Response: {
   "data": {
     "object": {
-      "address": "0x4ad90f4ed98d545600c66a80334410db765366c41e8e716766bd72822a77500d",
+      "address": "0x0a95d2ec15ae1074b8a4ab8707a4525292cc69047ad4c4a98d6482e751f9d278",
       "asMovePackage": {
         "module": {
           "datatypes": {
diff --git a/crates/sui-graphql-e2e-tests/tests/packages/enums.exp b/crates/sui-graphql-e2e-tests/tests/packages/enums.exp
index b7d17815e3731..276d723ffcbe2 100644
--- a/crates/sui-graphql-e2e-tests/tests/packages/enums.exp
+++ b/crates/sui-graphql-e2e-tests/tests/packages/enums.exp
@@ -22,19 +22,7 @@ Response: {
               "nodes": [
                 {
                   "outputState": {
-                    "address": "0x53b63659f4910b0563575a85dca3254f1eb41bd6f8235cf2508ee6c18f4293ab",
-                    "asMovePackage": null
-                  }
-                },
-                {
-                  "outputState": {
-                    "address": "0xcfe25a7e8b161ad78e604ecadb0e36787e46626bd2f8456ef76327771e685e6a",
-                    "asMovePackage": null
-                  }
-                },
-                {
-                  "outputState": {
-                    "address": "0xe1b0f83fd53dd4e358f7fd0d7a54eca9ad604dd7dc7ff46ef35a4dd69917bebd",
+                    "address": "0x2d9c1eb67a4b66df6a47dc2152d703a565288f2ee475270ff1ce440104dc3bf6",
                     "asMovePackage": {
                       "module": {
                         "enum": {
@@ -90,6 +78,18 @@ Response: {
                       }
                     }
                   }
+                },
+                {
+                  "outputState": {
+                    "address": "0x86977b4dfcf9e54527721bbceb6929cf8f29a913b2ef9acde85906b14f5c1401",
+                    "asMovePackage": null
+                  }
+                },
+                {
+                  "outputState": {
+                    "address": "0x8a8a244a30cb837389ea50533ae6bbdcc6203cfd3193fb0ee1979d93fed56a5a",
+                    "asMovePackage": null
+                  }
                 }
               ]
             }
@@ -119,25 +119,25 @@ Response: {
               "nodes": [
                 {
                   "outputState": {
-                    "address": "0x53b63659f4910b0563575a85dca3254f1eb41bd6f8235cf2508ee6c18f4293ab",
+                    "address": "0x86977b4dfcf9e54527721bbceb6929cf8f29a913b2ef9acde85906b14f5c1401",
                     "asMovePackage": null
                   }
                 },
                 {
                   "outputState": {
-                    "address": "0xcfe25a7e8b161ad78e604ecadb0e36787e46626bd2f8456ef76327771e685e6a",
+                    "address": "0x8a8a244a30cb837389ea50533ae6bbdcc6203cfd3193fb0ee1979d93fed56a5a",
                     "asMovePackage": null
                   }
                 },
                 {
                   "outputState": {
-                    "address": "0xfbcdbd13ea73e8f64987b7f222043422842ccb47cee8bac7d6eeea1274954abf",
+                    "address": "0xd42dcb64198dbe5099a4b4a2b4d7e9c95bfd8c67bf27497e0b81eca639025397",
                     "asMovePackage": {
                       "module": {
                         "s": {
                           "module": {
                             "package": {
-                              "address": "0xe1b0f83fd53dd4e358f7fd0d7a54eca9ad604dd7dc7ff46ef35a4dd69917bebd"
+                              "address": "0x2d9c1eb67a4b66df6a47dc2152d703a565288f2ee475270ff1ce440104dc3bf6"
                             }
                           },
                           "name": "S",
@@ -192,7 +192,7 @@ Response: {
                         "t": {
                           "module": {
                             "package": {
-                              "address": "0xfbcdbd13ea73e8f64987b7f222043422842ccb47cee8bac7d6eeea1274954abf"
+                              "address": "0xd42dcb64198dbe5099a4b4a2b4d7e9c95bfd8c67bf27497e0b81eca639025397"
                             }
                           },
                           "name": "T",
@@ -222,12 +222,12 @@ Response: {
                                 {
                                   "name": "s",
                                   "type": {
-                                    "repr": "0xe1b0f83fd53dd4e358f7fd0d7a54eca9ad604dd7dc7ff46ef35a4dd69917bebd::m::S",
+                                    "repr": "0x2d9c1eb67a4b66df6a47dc2152d703a565288f2ee475270ff1ce440104dc3bf6::m::S",
                                     "signature": {
                                       "ref": null,
                                       "body": {
                                         "datatype": {
-                                          "package": "0xe1b0f83fd53dd4e358f7fd0d7a54eca9ad604dd7dc7ff46ef35a4dd69917bebd",
+                                          "package": "0x2d9c1eb67a4b66df6a47dc2152d703a565288f2ee475270ff1ce440104dc3bf6",
                                           "module": "m",
                                           "type": "S",
                                           "typeParameters": []
@@ -261,7 +261,7 @@ Response: {
                                 {
                                   "name": "t",
                                   "type": {
-                                    "repr": "0xe1b0f83fd53dd4e358f7fd0d7a54eca9ad604dd7dc7ff46ef35a4dd69917bebd::m::T<0xe1b0f83fd53dd4e358f7fd0d7a54eca9ad604dd7dc7ff46ef35a4dd69917bebd::m::S>"
+                                    "repr": "0x2d9c1eb67a4b66df6a47dc2152d703a565288f2ee475270ff1ce440104dc3bf6::m::T<0x2d9c1eb67a4b66df6a47dc2152d703a565288f2ee475270ff1ce440104dc3bf6::m::S>"
                                   }
                                 }
                               ]