diff --git a/home/features/cli/ssh.nix b/home/features/cli/ssh.nix
index b144b07..2998f5c 100644
--- a/home/features/cli/ssh.nix
+++ b/home/features/cli/ssh.nix
@@ -1,10 +1,6 @@
-{ pkgs, ... }: {
+{
   programs.ssh.enable = true;
 
-  home.packages = with pkgs; [
-    mosh # SSH replacement for slow connections
-  ];
-
   # TODO: persistence
   # home.persistence = {
   #   "/persist/home/adrielus".directories = [ ".ssh" ];
diff --git a/hosts/nixos/common/global/openssh.nix b/hosts/nixos/common/global/openssh.nix
index 57a96a0..6c4e836 100644
--- a/hosts/nixos/common/global/openssh.nix
+++ b/hosts/nixos/common/global/openssh.nix
@@ -1,4 +1,5 @@
 # This setups a SSH server. 
+# TODO: persistence
 { outputs, config, lib, ... }:
 let
   # Record containing all the hosts
@@ -40,6 +41,9 @@ in
   # Passwordless sudo when SSH'ing with keys
   security.pam.enableSSHAgentAuth = true;
 
+  # SSH on slow connections
+  programs.mosh.enable = true;
+
   # Add each host in this repo to the knownHosts list
   programs.ssh = {
     knownHosts = lib.pipe hosts [