diff --git a/flake.nix b/flake.nix
index 23cee2d2..43ed8987 100644
--- a/flake.nix
+++ b/flake.nix
@@ -403,39 +403,7 @@
         schalter = nixosSystem' {
           modules = [
             "${nixos}/nixos/modules/installer/sd-card/sd-image-raspberrypi.nix"
-            ({ lib, ... }: {
-              networking.hostName = "schalter";
-              hardware.enableRedistributableFirmware = true;
-              #networking.wireless.enable = true;
-              powerManagement.cpuFreqGovernor = lib.mkDefault "performance";
-
-              boot = {
-                loader = {
-                  grub.enable = false;
-                  raspberryPi = {
-                    enable = true;
-                    version = 1;
-                    uboot.enable = false;
-                  };
-                  generic-extlinux-compatible.enable = lib.mkForce false;
-                };
-                # supportedFilesystems = lib.mkForce [ "vfat" "ext4" ];
-
-                tmpOnTmpfs = true;
-              };
-              nixpkgs.config.packageOverrides = pkgs: {
-                makeModulesClosure = x:
-                  # prevent kernel install fail due to missing modules
-                  pkgs.makeModulesClosure (x // { allowMissing = true; });
-              };
-              sdImage = {
-                compressImage = false;
-                imageBaseName = "schalter";
-                firmwareSize = 512;
-              };
-
-              nixpkgs.crossSystem = nixos.lib.systems.examples.raspberryPi;
-            })
+            ./hosts/schalter
           ];
           system = "x86_64-linux";
         };
diff --git a/hosts/schalter/default.nix b/hosts/schalter/default.nix
new file mode 100644
index 00000000..ae1569c7
--- /dev/null
+++ b/hosts/schalter/default.nix
@@ -0,0 +1,35 @@
+{ lib, ... }:
+
+{
+  networking.hostName = "schalter";
+  hardware.enableRedistributableFirmware = true;
+  #networking.wireless.enable = true;
+  powerManagement.cpuFreqGovernor = lib.mkDefault "performance";
+
+  boot = {
+    loader = {
+      grub.enable = false;
+      raspberryPi = {
+        enable = true;
+        version = 1;
+        uboot.enable = false;
+      };
+      generic-extlinux-compatible.enable = lib.mkForce false;
+    };
+    # supportedFilesystems = lib.mkForce [ "vfat" "ext4" ];
+
+    tmpOnTmpfs = true;
+  };
+  nixpkgs.config.packageOverrides = pkgs: {
+    makeModulesClosure = x:
+      # prevent kernel install fail due to missing modules
+      pkgs.makeModulesClosure (x // { allowMissing = true; });
+  };
+  sdImage = {
+    compressImage = false;
+    imageBaseName = "schalter";
+    firmwareSize = 512;
+  };
+
+  nixpkgs.crossSystem = lib.systems.examples.raspberryPi;
+}