diff --git a/nix/overlay.nix b/nix/overlay.nix
index aab82d1ea..e9bd5c7cf 100644
--- a/nix/overlay.nix
+++ b/nix/overlay.nix
@@ -14,7 +14,6 @@ in
 
   # Override "nixpkgs" circt with "nixpkgs-for-circt".
   # To update the "nixpkgs-for-circt" input, run `nix flake lock --update-input nixpkgs-for-circt`.
-  circt = self.inputs.nixpkgs-for-circt.legacyPackages."${final.system}".circt;
   espresso = final.callPackage ./pkgs/espresso.nix { };
   dramsim3 = final.callPackage ./pkgs/dramsim3.nix { };
   libspike = final.callPackage ./pkgs/libspike.nix { };
@@ -22,6 +21,15 @@ in
   fetchMillDeps = final.callPackage ./pkgs/mill-builder.nix { };
   circt-full = final.callPackage ./pkgs/circt-full.nix { };
 
+  circt = self.inputs.nixpkgs-for-circt.legacyPackages."${final.system}".circt.overrideAttrs (oldAttrs: rec {
+    patches = [
+      (prev.fetchpatch {
+        url = "https://github.com/llvm/circt/pull/6893.patch";
+        sha256 = "sha256-PaWMYFtKMaBLVhoqLAHh97lRlolsIwyQcHOAJNTAZFo=";
+      })
+    ];
+  });
+
   mill = let jre = final.jdk21; in
     (prev.mill.override { inherit jre; }).overrideAttrs (_: {
       passthru = { inherit jre; };
diff --git a/nix/t1/_sources/generated.json b/nix/t1/_sources/generated.json
index 95fa4c438..ebc0e5258 100644
--- a/nix/t1/_sources/generated.json
+++ b/nix/t1/_sources/generated.json
@@ -61,7 +61,7 @@
     },
     "chisel": {
         "cargoLocks": null,
-        "date": "2024-03-27",
+        "date": "2024-04-06",
         "extract": null,
         "name": "chisel",
         "passthru": null,
@@ -73,11 +73,11 @@
             "name": null,
             "owner": "chipsalliance",
             "repo": "chisel",
-            "rev": "9177535ff1be47ffd99034bf0154c0f1ec637419",
-            "sha256": "sha256-smqNuOnmz+MeVGyS7mdIzegniQ/6EJH4CFqK4JntvrI=",
+            "rev": "88942f925dd184b3bb626e4e6442c3edf1c421d1",
+            "sha256": "sha256-WFQ/MyZu2Tt8/Zw23hJaEJil3mRDOYUKO2dqAMr7WAc=",
             "type": "github"
         },
-        "version": "9177535ff1be47ffd99034bf0154c0f1ec637419"
+        "version": "88942f925dd184b3bb626e4e6442c3edf1c421d1"
     },
     "diplomacy": {
         "cargoLocks": null,
diff --git a/nix/t1/_sources/generated.nix b/nix/t1/_sources/generated.nix
index c8f7bebc9..6cf13bd05 100644
--- a/nix/t1/_sources/generated.nix
+++ b/nix/t1/_sources/generated.nix
@@ -39,15 +39,15 @@
   };
   chisel = {
     pname = "chisel";
-    version = "9177535ff1be47ffd99034bf0154c0f1ec637419";
+    version = "88942f925dd184b3bb626e4e6442c3edf1c421d1";
     src = fetchFromGitHub {
       owner = "chipsalliance";
       repo = "chisel";
-      rev = "9177535ff1be47ffd99034bf0154c0f1ec637419";
+      rev = "88942f925dd184b3bb626e4e6442c3edf1c421d1";
       fetchSubmodules = false;
-      sha256 = "sha256-smqNuOnmz+MeVGyS7mdIzegniQ/6EJH4CFqK4JntvrI=";
+      sha256 = "sha256-WFQ/MyZu2Tt8/Zw23hJaEJil3mRDOYUKO2dqAMr7WAc=";
     };
-    date = "2024-03-27";
+    date = "2024-04-06";
   };
   diplomacy = {
     pname = "diplomacy";
diff --git a/nix/t1/default.nix b/nix/t1/default.nix
index b08635761..02079cefb 100644
--- a/nix/t1/default.nix
+++ b/nix/t1/default.nix
@@ -68,10 +68,10 @@ lib.makeScope newScope
       ip = {
         recurseForDerivations = true;
 
-        mlirbc = innerSelf.callPackage ./mlirbc.nix { target = "ip"; /* use-binder = true; */ };
+        mlirbc = innerSelf.callPackage ./mlirbc.nix { target = "ip"; use-binder = true; };
         rtl = innerSelf.callPackage ./rtl.nix { mlirbc = innerSelf.ip.mlirbc; };
 
-        emu-mlirbc = innerSelf.callPackage ./mlirbc.nix { target = "ipemu"; /* use-binder = true; */ };
+        emu-mlirbc = innerSelf.callPackage ./mlirbc.nix { target = "ipemu"; use-binder = true; };
         emu-rtl = innerSelf.callPackage ./rtl.nix { mlirbc = innerSelf.ip.emu-mlirbc; };
 
         emu = innerSelf.callPackage ./ipemu.nix { rtl = innerSelf.ip.emu-rtl; stdenv = moldStdenv; };
@@ -81,7 +81,7 @@ lib.makeScope newScope
       subsystem = {
         recurseForDerivations = true;
 
-        mlirbc = innerSelf.callPackage ./mlirbc.nix { target = "subsystem"; /* use-binder = true; */ };
+        mlirbc = innerSelf.callPackage ./mlirbc.nix { target = "subsystem"; use-binder = true; };
         rtl = innerSelf.callPackage ./rtl.nix { mlirbc = innerSelf.subsystem.mlirbc; };
       };
     })
diff --git a/nix/t1/nvfetcher.toml b/nix/t1/nvfetcher.toml
index f55d0a694..0196d41ad 100644
--- a/nix/t1/nvfetcher.toml
+++ b/nix/t1/nvfetcher.toml
@@ -35,7 +35,7 @@ fetch.github = "chipsalliance/rocket-chip-inclusive-cache"
 
 [chisel]
 src.git = "https://github.com/chipsalliance/chisel"
-src.branch = "main"
+src.branch = "binder-large-integer"
 fetch.github = "chipsalliance/chisel"
 
 [rvdecoderdb]
diff --git a/nix/t1/result b/nix/t1/result
new file mode 120000
index 000000000..6d3bfa73b
--- /dev/null
+++ b/nix/t1/result
@@ -0,0 +1 @@
+/nix/store/in7jgajijq1ilgyb75w123rj4k2cjy26-t1-subsystem-blastoise-mlirbc
\ No newline at end of file
diff --git a/nix/t1/t1.nix b/nix/t1/t1.nix
index c02c2bdf1..e49175d61 100644
--- a/nix/t1/t1.nix
+++ b/nix/t1/t1.nix
@@ -96,7 +96,7 @@ let
 
       mkdir -p $configgen/bin $elaborator/bin
       makeWrapper ${jdk21}/bin/java $configgen/bin/configgen --add-flags "-jar $out/share/java/configgen.jar"
-      makeWrapper ${jdk21}/bin/java $elaborator/bin/elaborator --add-flags "--enable-preview -Djava.library.path=${circt-full}/lib -jar $out/share/java/elaborator.jar"
+      makeWrapper ${jdk21}/bin/java $elaborator/bin/elaborator --add-flags "--enable-preview -Djava.library.path=${circt-full}/lib -Xmx64G -jar $out/share/java/elaborator.jar"
     '';
   };
 in