diff --git a/flake.nix b/flake.nix
index 90ecd9d..ef32871 100644
--- a/flake.nix
+++ b/flake.nix
@@ -67,17 +67,22 @@
         };
       } // colmenaHive.nodes;
 
-      homeConfigurations.sammy =
+      homeConfigurations =
         let
           pkgs = import nixpkgs { system = "x86_64-linux"; };
+          mkHome = { user ? "sammy", hostname ? null }:
+            lib.homeManagerConfiguration {
+              inherit pkgs;
+              modules = [ ./modules/users/${user}.nix ] ++ lib.optional (!isNull hostname) ./modules/home/hosts/${hostname}.nix;
+              extraSpecialArgs = {
+                inherit inputs outputs;
+                pkgs-unstable = import nixpkgs-unstable { system = "x86_64-linux"; };
+              };
+            };
         in
-        lib.homeManagerConfiguration {
-          inherit pkgs;
-          modules = [ ./modules/users/sammy.nix ];
-          extraSpecialArgs = {
-            inherit inputs outputs;
-            pkgs-unstable = import nixpkgs-unstable { system = "x86_64-linux"; };
-          };
+        {
+          sammy = mkHome { };
+          "sammy@chansey" = mkHome { hostname = "chansey"; };
         };
     };
 }
diff --git a/modules/home/hosts/chansey.nix b/modules/home/hosts/chansey.nix
new file mode 100644
index 0000000..01ac48b
--- /dev/null
+++ b/modules/home/hosts/chansey.nix
@@ -0,0 +1,5 @@
+{ ... }: {
+  programs.ssh.includes = [
+    "./famedly-config"
+  ];
+}