diff --git a/container/flake.lock b/container/flake.lock
index fb53881..11067e3 100644
--- a/container/flake.lock
+++ b/container/flake.lock
@@ -17,22 +17,6 @@
       }
     },
     "nixpkgs_2": {
-      "locked": {
-        "lastModified": 1744536153,
-        "narHash": "sha256-awS2zRgF4uTwrOKwwiJcByDzDOdo3Q1rPZbiHQg/N38=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "18dd725c29603f582cf1900e0d25f9f1063dbf11",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixpkgs-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_3": {
       "locked": {
         "lastModified": 1778003029,
         "narHash": "sha256-q/nkKLDtHIyLjZpKhWk3cSK5IYsFqtMd6UtXF3ddjgA=",
@@ -48,7 +32,7 @@
         "type": "github"
       }
     },
-    "nixpkgs_4": {
+    "nixpkgs_3": {
       "locked": {
         "lastModified": 1744536153,
         "narHash": "sha256-awS2zRgF4uTwrOKwwiJcByDzDOdo3Q1rPZbiHQg/N38=",
@@ -67,31 +51,12 @@
     "root": {
       "inputs": {
         "nixpkgs": "nixpkgs",
-        "rust-overlay": "rust-overlay",
         "trictrac": "trictrac"
       }
     },
     "rust-overlay": {
       "inputs": {
-        "nixpkgs": "nixpkgs_2"
-      },
-      "locked": {
-        "lastModified": 1778123869,
-        "narHash": "sha256-hV9D8ET33kXjdoMXBT2bwM/j8WQM1SP/dVKZtjQKhAQ=",
-        "owner": "oxalica",
-        "repo": "rust-overlay",
-        "rev": "592e5dedf04f0eaff1ed0f01ce5db7407d9fc7be",
-        "type": "github"
-      },
-      "original": {
-        "owner": "oxalica",
-        "repo": "rust-overlay",
-        "type": "github"
-      }
-    },
-    "rust-overlay_2": {
-      "inputs": {
-        "nixpkgs": "nixpkgs_4"
+        "nixpkgs": "nixpkgs_3"
       },
       "locked": {
         "lastModified": 1778123869,
@@ -109,8 +74,8 @@
     },
     "trictrac": {
       "inputs": {
-        "nixpkgs": "nixpkgs_3",
-        "rust-overlay": "rust-overlay_2"
+        "nixpkgs": "nixpkgs_2",
+        "rust-overlay": "rust-overlay"
       },
       "locked": {
         "path": "..",
diff --git a/container/flake.nix b/container/flake.nix
index 86b1559..84f8d13 100644
--- a/container/flake.nix
+++ b/container/flake.nix
@@ -2,9 +2,8 @@
   inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.11";
   # inputs.trictrac.url = "github:mmai/trictrac";
   inputs.trictrac.url = "..";
-  inputs.rust-overlay.url = "github:oxalica/rust-overlay";
 
-  outputs = { self, nixpkgs, trictrac, rust-overlay }:
+  outputs = { self, nixpkgs, trictrac }:
     {
       nixosConfigurations = {
 
@@ -30,8 +29,8 @@
                 networking.firewall.allowedTCPPorts = [ 80 ];
                 networking.hostName = hostname;
 
-                # rust-overlay must be applied first so trictrac.overlay can use rust-bin
-                nixpkgs.overlays = [ rust-overlay.overlays.default trictrac.overlay ];
+                # trictrac.overlay already includes rust-overlay
+                nixpkgs.overlays = [ trictrac.overlay ];
 
                 services.trictrac = {
                   enable = true;
diff --git a/flake.nix b/flake.nix
index 8adc0ba..586e2fc 100644
--- a/flake.nix
+++ b/flake.nix
@@ -8,13 +8,16 @@
 
   outputs = { self, nixpkgs, rust-overlay }:
     let
+      rustPkgs = import nixpkgs {
+        inherit (final) system;
+        overlays = [ rust-overlay.overlays.default ];
+      };
       systems = [ "x86_64-linux" "i686-linux" "aarch64-linux" ];
       forAllSystems = f: nixpkgs.lib.genAttrs systems (system: f system);
-      # rust-overlay must be applied before self.overlay so that rust-bin is available
       nixpkgsFor = forAllSystems (system:
         import nixpkgs {
           inherit system;
-          overlays = [ rust-overlay.overlays.default self.overlay ];
+          overlays = [ self.overlay ];
         }
       );
     in
@@ -24,7 +27,7 @@
         trictrac-front =
           let
             # WASM build needs wasm32-unknown-unknown target in the Rust toolchain
-            rustToolchain = final.rust-bin.stable.latest.default.override {
+            rustToolchain = rustPkgs.rust-bin.stable.latest.default.override {
               targets = [ "wasm32-unknown-unknown" ];
             };
             rustPlatform = final.makeRustPlatform {