diff --git a/default-home.nix b/default-home.nix
index 845c99a..00fe22d 100644
--- a/default-home.nix
+++ b/default-home.nix
@@ -240,12 +240,7 @@ in
     enable = true;
     package = unstable.aerc;
   };
-  services.ssh-agent.enable = true;
   services.mako.enable = false;
-  services.gpg-agent = {
-    enable = false;
-    defaultCacheTtl = 1800;
-  };
 
   programs.direnv = {
     enable = true;
diff --git a/flake.nix b/flake.nix
index 1125f47..335be53 100644
--- a/flake.nix
+++ b/flake.nix
@@ -200,7 +200,7 @@
         # ];
       };
       nixosConfigurations.edge = basicSystem {
-        useUnstable = false;
+        useUnstable = true;
         modules = [
           ./host-specific/edge/configuration.nix
         ];
diff --git a/ssh.nix b/ssh.nix
index 7adf6cd..660e603 100644
--- a/ssh.nix
+++ b/ssh.nix
@@ -10,6 +10,9 @@ let
     // attrs;
 in
 {
+  services.ssh-agent.enable = true;
+  services.gpg-agent.enable = false;
+
   age.secrets.ssh-hosts = {
     file = ./secrets/ssh-hosts.age;
     path = "${config.xdg.configHome}/ssh/hosts";