diff --git a/flake.nix b/flake.nix
index 76993ed..4d89476 100644
--- a/flake.nix
+++ b/flake.nix
@@ -34,6 +34,25 @@
         ] ++ modules;
         specialArgs = { inherit inputs self; };
       };
+
+      pkgsFor = system: import nixpkgs {
+        inherit system;
+        overlays = [ overlay-unstable ];
+      };
+
+      deployPkgsFor = system: import nixpkgs {
+        inherit system;
+        overlays = [
+          overlay-unstable
+          deploy-rs.overlay
+          (self: super: {
+            deploy-rs = {
+              inherit (pkgsFor system) deploy-rs;
+              lib = super.deploy-rs.lib;
+            };
+          })
+        ];
+      };
     in {
       nixosConfigurations = {
         c1 = mkNixos "x86_64-linux" [ ./hosts/c1 ];
@@ -51,35 +70,35 @@
             hostname = "c1";
             profiles.system = {
               user = "root";
-              path = deploy-rs.lib.x86_64-linux.activate.nixos self.nixosConfigurations.c1;
+              path = (deployPkgsFor "x86_64-linux").deploy-rs.lib.activate.nixos self.nixosConfigurations.c1;
             };
           };
           c2 = {
             hostname = "c2";
             profiles.system = {
               user = "root";
-              path = deploy-rs.lib.x86_64-linux.activate.nixos self.nixosConfigurations.c2;
+              path = (deployPkgsFor "x86_64-linux").deploy-rs.lib.activate.nixos self.nixosConfigurations.c2;
             };
           };
           c3 = {
             hostname = "c3";
             profiles.system = {
               user = "root";
-              path = deploy-rs.lib.x86_64-linux.activate.nixos self.nixosConfigurations.c3;
+              path = (deployPkgsFor "x86_64-linux").deploy-rs.lib.activate.nixos self.nixosConfigurations.c3;
             };
           };
           nix-dev = {
             hostname = "nix-dev";
             profiles.system = {
               user = "root";
-              path = deploy-rs.lib.x86_64-linux.activate.nixos self.nixosConfigurations.nix-dev;
+              path = (deployPkgsFor "x86_64-linux").deploy-rs.lib.activate.nixos self.nixosConfigurations.nix-dev;
             };
           };
           alo-cloud-1 = {
             hostname = "49.13.163.72";
             profiles.system = {
               user = "root";
-              path = deploy-rs.lib.aarch64-linux.activate.nixos self.nixosConfigurations.alo-cloud-1;
+              path = (deployPkgsFor "aarch64-linux").deploy-rs.lib.activate.nixos self.nixosConfigurations.alo-cloud-1;
             };
           };
           zippy = {
@@ -87,11 +106,11 @@
             profiles = {
               system = {
                 user = "root";
-                path = deploy-rs.lib.x86_64-linux.activate.nixos self.nixosConfigurations.zippy;
+                path = (deployPkgsFor "x86_64-linux").deploy-rs.lib.activate.nixos self.nixosConfigurations.zippy;
               };
               ppetru = {
                 user = "ppetru";
-                path = deploy-rs.lib.x86_64-linux.activate.home-manager ppetru-home.homeConfigurations.ppetru;
+                path = (deployPkgsFor "x86_64-linux").deploy-rs.lib.activate.home-manager ppetru-home.homeConfigurations.ppetru;
               };
             };
           };
@@ -100,11 +119,11 @@
             profiles = {
               system = {
                 user = "root";
-                path = deploy-rs.lib.x86_64-linux.activate.nixos self.nixosConfigurations.chilly;
+                path = (deployPkgsFor "x86_64-linux").deploy-rs.lib.activate.nixos self.nixosConfigurations.chilly;
               };
               ppetru = {
                 user = "ppetru";
-                path = deploy-rs.lib.x86_64-linux.activate.home-manager ppetru-home.homeConfigurations.ppetru;
+                path = (deployPkgsFor "x86_64-linux").deploy-rs.lib.activate.home-manager ppetru-home.homeConfigurations.ppetru;
               };
             };
           };