diff --git a/flake.lock b/flake.lock
index 65fe8aee..d3e18a69 100644
--- a/flake.lock
+++ b/flake.lock
@@ -53,16 +53,16 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1618388647,
-        "narHash": "sha256-qs2LLMWfFI51MiSyt4azliM6tdBgaIonRqD7Oq8Nxjk=",
-        "owner": "nixos",
+        "lastModified": 1618560353,
+        "narHash": "sha256-8I2frsJ7raO0k4tl49D31DgaRKd/bZ4LP7pBmgR7/1g=",
+        "owner": "chvp",
         "repo": "nixpkgs",
-        "rev": "b3d70196ea1b4586414122ae1aadff5c37ef9611",
+        "rev": "c4a1855ef2ee48298d9a55e7e040c8abebd6f6b2",
         "type": "github"
       },
       "original": {
-        "owner": "nixos",
-        "ref": "nixos-unstable-small",
+        "owner": "chvp",
+        "ref": "nixos-rebuild-remote-flakes",
         "repo": "nixpkgs",
         "type": "github"
       }
@@ -80,11 +80,11 @@
         "flake-utils": "flake-utils"
       },
       "locked": {
-        "lastModified": 1618392274,
-        "narHash": "sha256-kX7Hpn/nl//eWDa1QzkiSdbskdeH+HwWFP0iIo7gYH8=",
+        "lastModified": 1618507051,
+        "narHash": "sha256-+e3AuL7BxxHyRfLiEsDnm5kwZk3EvKntqMYS3jtvEPw=",
         "owner": "gytis-ivaskevicius",
         "repo": "flake-utils-plus",
-        "rev": "0b101bd6b34ed4b44d6d0126d2508d68801f1ba3",
+        "rev": "c87df35ff6a925ea88a0cb98662c91b451bf1cfc",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index 268126c3..2c5a5bfb 100644
--- a/flake.nix
+++ b/flake.nix
@@ -7,7 +7,7 @@
       url = "github:nix-community/home-manager";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-    nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable-small";
+    nixpkgs.url = "github:chvp/nixpkgs/nixos-rebuild-remote-flakes";
     utils.url = "github:gytis-ivaskevicius/flake-utils-plus/staging";
   };
 
diff --git a/remote.sh b/remote.sh
index 8ecc6942..8e78bbe9 100755
--- a/remote.sh
+++ b/remote.sh
@@ -2,7 +2,4 @@
 set -euo pipefail
 set -x
 
-drv=$(nix eval .#nixosConfigurations.$1.config.system.build.toplevel.drvPath | tr -d '"')
-nix copy --derivation -s --to "ssh://root@$1" "$drv"
-ssh root@$1 nix build -L --no-link "$drv"
 nixos-rebuild --flake .#$1 --target-host root@$1 $2
diff --git a/update.sh b/update.sh
index 4f64823e..8de0d933 100755
--- a/update.sh
+++ b/update.sh
@@ -6,9 +6,7 @@ nix flake update
 
 if [ -z "${OVERRIDE:-}" ]
 then
-    nix build --no-link --profile /nix/var/nix/profiles/per-user/charlotte/`hostname` .#nixosConfigurations.`hostname`.config.system.build.toplevel
-    su -c "nixos-rebuild --flake . switch"
+    su -c "nixos-rebuild --flake . --build-host root@urithiru switch"
 else
-    nix build --no-link --override-input nixpkgs ../nixpkgs --no-write-lock-file --profile /nix/var/nix/profiles/per-user/charlotte/`hostname` .#nixosConfigurations.`hostname`.config.system.build.toplevel
-    su -c "nixos-rebuild --flake . --override-input nixpkgs ../nixpkgs --no-write-lock-file switch"
+    su -c "nixos-rebuild --flake . --build-host root@urithiru --override-input nixpkgs ../nixpkgs --no-write-lock-file switch"
 fi