diff --git a/flake.nix b/flake.nix
index 8592cd58..285fae9e 100644
--- a/flake.nix
+++ b/flake.nix
@@ -35,7 +35,12 @@
               set -ev
               nix-copy-closure --to ${target} ${secrets}
               nix-copy-closure --to ${target} ${self}
-              exec ssh -t ${target} nixos-rebuild --flake ${self}#${name} $@
+              if [ "$1" = "--flakify" ]; then
+                shift
+                exec ssh -t ${target} "nix-shell -p nixFlakes --command \"_NIXOS_REBUILD_REEXEC=1 nixos-rebuild --flake ${self}#${name} \"$@"
+              else
+                exec ssh -t ${target} nixos-rebuild --flake ${self}#${name} $@
+              fi
             '';
           mkWake = name:
             pkgs.writeScriptBin "${name}-wake" ''