diff --git a/.bazelrc b/.bazelrc
index e5da1791dd..d5c1c62837 100644
--- a/.bazelrc
+++ b/.bazelrc
@@ -46,5 +46,5 @@ build:aarch64 --crosstool_top=@crosstool//:toolchains
 build:aarch64 --cpu=aarch64
 build:aarch64 --platforms=@io_bazel_rules_go//go/toolchain:linux_arm64
 
-common --noenable_bzlmod
-common --enable_workspace
+common --enable_bzlmod
+common --noenable_workspace
diff --git a/MODULE.bazel b/MODULE.bazel
index 41713732a3..df96b62336 100644
--- a/MODULE.bazel
+++ b/MODULE.bazel
@@ -41,15 +41,15 @@ python.defaults(python_version = "3.11")
 python.toolchain(python_version = "3.11")
 
 ### Crosstool
-coral_crosstool_extension = use_extension("//:tools/bazeldefs/extensions/coral_crosstool.bzl", "coral_crosstool_extension")
+coral_crosstool_extension = use_extension("//tools/bazeldefs:extensions/coral_crosstool.bzl", "coral_crosstool_extension")
 use_repo(coral_crosstool_extension, "coral_crosstool")
 
-crosstool = use_extension("//:tools/bazeldefs/extensions/crosstool.bzl", "crosstool_extension")
+crosstool = use_extension("//tools/bazeldefs:extensions/crosstool.bzl", "crosstool_extension")
 use_repo(crosstool, "crosstool")
 
 ### zlib-ng
-# TODO: try using "zlib-ng" from BCR
-llvm_zlib = use_extension("//:tools/bazeldefs/extensions/llvm_zlib.bzl", "llvm_zlib_extension")
+# TODO: try using "zlib-ng" from BCR once llvm-raw is used directly from BCR
+llvm_zlib = use_extension("//tools/bazeldefs:extensions/llvm_zlib.bzl", "llvm_zlib_extension")
 use_repo(llvm_zlib, "llvm_zlib")
 
 ### Repo rules
diff --git a/tools/bazeldefs/extensions/crosstool.bzl b/tools/bazeldefs/extensions/crosstool.bzl
index 71abdd60e2..c9812ad246 100644
--- a/tools/bazeldefs/extensions/crosstool.bzl
+++ b/tools/bazeldefs/extensions/crosstool.bzl
@@ -2,12 +2,7 @@
 
 load("@coral_crosstool//:configure.bzl", "cc_crosstool")
 
-def _crosstool_impl(ctx):
-    cc_crosstool(
-        name = "crosstool",
-        c_version = "gnu17",
-    )
 
 crosstool_extension = module_extension(
-    implementation = _crosstool_impl,
+    implementation = lambda mctx: cc_crosstool(name = "crosstool", c_version = "gnu17"),
 )