diff --git a/nixos/kamaitachi/default.nix b/nixos/kamaitachi/default.nix
index 5ce4c02..bf4b168 100644
--- a/nixos/kamaitachi/default.nix
+++ b/nixos/kamaitachi/default.nix
@@ -15,8 +15,22 @@ let
     ${pkgs.klipperscreen}/bin/KlipperScreen --configfile ${klipperScreenConfig}
   '';
   klipperHostMcu = "${
-      pkgs.klipper-firmware.override { firmwareConfig = ./klipper-rpi.cfg; }
+      pkgs.klipper-firmware.override {
+        firmwareConfig = ./klipper-rpi.cfg;
+        klipper = klipperOld;
+      }
     }/klipper.elf";
+  klipperOld = pkgs.klipper.overrideAttrs (old: {
+    version = "unstable-dc6182f3";
+
+    src = pkgs.fetchFromGitHub {
+      owner = "KevinOConnor";
+      repo = "klipper";
+      rev =
+        "dc6182f3b339b990c8a68940f02a210e332be269"; # 266e96621c0133e1192bbaec5addb6bcf443a203 broke shit in weird ways
+      sha256 = "sha256-0uoq5bvL/4L9oa/JY54qHMRw5vE7V//HxLFMOEqGUjA=";
+    };
+  });
 in {
   # https://en.wikipedia.org/wiki/Kamaitachi
   networking.hostName = "kamaitachi";
@@ -237,7 +251,10 @@ in {
         enable = true;
         configFile = ./klipper-skr-pico.cfg;
         serial = "/dev/ttyAMA0";
-        package = pkgs.klipper-firmware.override { };
+        package = pkgs.klipper-firmware.override {
+          gcc-arm-embedded = pkgs.gcc-arm-embedded-11;
+          klipper = klipperOld;
+        };
       };
     };
     settings = {