diff --git a/flake.nix b/flake.nix
index 31f03551..8e2a0028 100644
--- a/flake.nix
+++ b/flake.nix
@@ -657,10 +657,11 @@
             ./hosts/rpi-netboot
           ];
           system = "aarch64-linux";
+        };
 
         schalter = nixosSystem' {
           modules = [
-            "${inputs.nixpkgs}/nixos/modules/installer/sd-card/sd-image-raspberrypi.nix"
+            "${nixos}/nixos/modules/installer/sd-card/sd-image-raspberrypi.nix"
             ({ lib, ... }: {
               networking.hostName = "schalter";
               hardware.enableRedistributableFirmware = true;
@@ -673,8 +674,9 @@
                   raspberryPi = {
                     enable = true;
                     version = 1;
-                    uboot.enable = true;
+                    uboot.enable = false;
                   };
+                  generic-extlinux-compatible.enable = lib.mkForce false;
                 };
                 # supportedFilesystems = lib.mkForce [ "vfat" "ext4" ];
 
@@ -686,9 +688,10 @@
                 firmwareSize = 512;
               };
 
+              nixpkgs.crossSystem = nixos.lib.systems.examples.raspberryPi;
             })
           ];
-          system = "armv6l-linux";
+          system = "x86_64-linux";
         };
 
         matemat = nixosSystem' {