diff --git a/nix/modules/home/common.nix b/nix/modules/home/common.nix
index 61436cf..79f7b99 100644
--- a/nix/modules/home/common.nix
+++ b/nix/modules/home/common.nix
@@ -46,4 +46,6 @@
   news.display = "silent";
 
   programs.home-manager.enable = true;
+
+  services.ssh-agent.enable = pkgs.stdenv.isLinux;
 }
diff --git a/nix/modules/nixos/common.nix b/nix/modules/nixos/common.nix
index a0bf154..49181f8 100644
--- a/nix/modules/nixos/common.nix
+++ b/nix/modules/nixos/common.nix
@@ -21,11 +21,11 @@
   };
 
   programs.zsh.enable = true;
+  programs.ssh.startAgent = true;
 
   nix.settings = {
     experimental-features = [ "nix-command" "flakes" ];
     auto-optimise-store = true;
-    use-ssh-config = true;
   };
 
   nixpkgs.config.allowUnfree = true;