diff --git a/deploy b/deploy
index c783cfa..3c6b3c5 100755
--- a/deploy
+++ b/deploy
@@ -20,20 +20,25 @@ function hash {
 
 host="${1}"
 rev="$(git rev-parse HEAD)"
-url="https://github.com/dadada/nix-config/archive/${rev}.tar.gz"
 sha256=$(hash "$rev")
 
-cat <<EOF | ssh "${host}".dadada.li 'sudo nix-shell -p tmux --run "cat - > /etc/nixos/deploy.nix && tmux new -d \"nixos-rebuild switch |& tee /var/log/dadada-deploy.log\""'
+cat <<EOF | ssh "${host}".dadada.li 'sudo nix-shell -p tmux --run "cat - > /etc/nixos/configuration.nix && tmux new -d \"nixos-rebuild switch |& tee /var/log/dadada-deploy.log\""'
+let
+  host = "$host";
+  rev = "$rev";
+  sha256 = "$sha256";
+in
 { config, pkgs, lib, ... }:
 let
   dadada = import (builtins.fetchTarball {
-    url = ${url};
-    sha256 = "${sha256}";
+    url = "https://github.com/dadada/nix-config/archive/\${rev}.tar.gz";
+    sha256 = sha256;
   }) { inherit pkgs; };
-in {
+in
+{
   imports = [
     ./hardware-configuration.nix
-    dadada.hosts."${host}"
+    dadada.hosts."\${host}"
   ];
 }
 EOF
diff --git a/hosts/gorgon/default.nix b/hosts/gorgon/default.nix
index 35a0e43..fedcd66 100644
--- a/hosts/gorgon/default.nix
+++ b/hosts/gorgon/default.nix
@@ -121,4 +121,6 @@ in
     "192.168.42.11" = [ "wohnzimmerpi.dadada.li" "wohnzimmerpi" ];
     "10.1.2.9" = [ "fgprinter.fginfo.tu-bs.de" ];
   };
+
+  system.stateVersion = "20.03";
 }
diff --git a/hosts/ifrit/default.nix b/hosts/ifrit/default.nix
index 36e9a83..8209920 100644
--- a/hosts/ifrit/default.nix
+++ b/hosts/ifrit/default.nix
@@ -166,4 +166,6 @@ in
       workstation = false;
     };
   };
+
+  system.stateVersion = "20.03";
 }
diff --git a/hosts/pruflas/default.nix b/hosts/pruflas/default.nix
index 2396c8c..4d6b346 100644
--- a/hosts/pruflas/default.nix
+++ b/hosts/pruflas/default.nix
@@ -121,4 +121,6 @@ in
       }
     ];
   };
+
+  system.stateVersion = "20.09";
 }
diff --git a/hosts/surgat/default.nix b/hosts/surgat/default.nix
index ab4fdfa..1c8578a 100644
--- a/hosts/surgat/default.nix
+++ b/hosts/surgat/default.nix
@@ -118,4 +118,6 @@ in
       }
     ];
   };
+
+  system.stateVersion = "20.09";
 }