diff --git a/openedx/core/djangoapps/xblock/runtime/runtime.py b/openedx/core/djangoapps/xblock/runtime/runtime.py
index 2ae4a431bfbe..eca83784fe37 100644
--- a/openedx/core/djangoapps/xblock/runtime/runtime.py
+++ b/openedx/core/djangoapps/xblock/runtime/runtime.py
@@ -20,7 +20,7 @@
 from xblock.exceptions import NoSuchServiceError
 from xblock.field_data import DictFieldData, FieldData, SplitFieldData
 from xblock.fields import Scope, ScopeIds
-from xblock.runtime import IdReader, KvsFieldData, MemoryIdManager, Runtime
+from xblock.runtime import IdReader, KvsFieldData, Runtime
 
 from xmodule.errortracker import make_error_tracker
 from xmodule.contentstore.django import contentstore
@@ -127,7 +127,7 @@ def __init__(
             ),
             default_class=None,
             select=None,
-            id_generator=MemoryIdManager(),  # We don't really use id_generator until we need to support asides
+            id_generator=None,  # We won't need an id_generator until we need to support asides
         )
         assert student_data_mode in (StudentDataMode.Ephemeral, StudentDataMode.Persisted)
         self.authored_data_mode = authored_data_mode
diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt
index 96a3d75845ce..5227bcfd0080 100644
--- a/requirements/edx/base.txt
+++ b/requirements/edx/base.txt
@@ -1241,7 +1241,7 @@ wheel==0.45.1
     # via django-pipeline
 wrapt==2.0.1
     # via -r requirements/edx/kernel.in
-xblock[django]==5.3.0
+git+https://github.com/kdmccormick/XBlock.git@kdmccormick/scope-id-types#egg=xblock[django]==6.0.0
     # via
     #   -r requirements/edx/kernel.in
     #   acid-xblock
diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt
index 2f9dbe37e3d6..66b32154c66b 100644
--- a/requirements/edx/development.txt
+++ b/requirements/edx/development.txt
@@ -2264,7 +2264,7 @@ wrapt==2.0.1
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
-xblock[django]==5.3.0
+git+https://github.com/kdmccormick/XBlock.git@kdmccormick/scope-id-types#egg=xblock[django]==6.0.0
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
diff --git a/requirements/edx/doc.txt b/requirements/edx/doc.txt
index 0414d0c49421..3cdfa0edc211 100644
--- a/requirements/edx/doc.txt
+++ b/requirements/edx/doc.txt
@@ -1582,7 +1582,7 @@ wheel==0.45.1
     #   django-pipeline
 wrapt==2.0.1
     # via -r requirements/edx/base.txt
-xblock[django]==5.3.0
+git+https://github.com/kdmccormick/XBlock.git@kdmccormick/scope-id-types#egg=xblock[django]==6.0.0
     # via
     #   -r requirements/edx/base.txt
     #   acid-xblock
diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt
index b66725171b7f..cddc5b54c524 100644
--- a/requirements/edx/testing.txt
+++ b/requirements/edx/testing.txt
@@ -1672,7 +1672,7 @@ wheel==0.45.1
     #   django-pipeline
 wrapt==2.0.1
     # via -r requirements/edx/base.txt
-xblock[django]==5.3.0
+git+https://github.com/kdmccormick/XBlock.git@kdmccormick/scope-id-types#egg=xblock[django]==6.0.0
     # via
     #   -r requirements/edx/base.txt
     #   acid-xblock