diff --git a/flake.lock b/flake.lock
index f5f182dd..970e3648 100644
--- a/flake.lock
+++ b/flake.lock
@@ -38,11 +38,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1617822567,
-        "narHash": "sha256-hDnjcuxRtm/+x/pEAWkKo4AfjKMCil2zfoK/zBygjB4=",
+        "lastModified": 1618436674,
+        "narHash": "sha256-9y5Y7YK2W+kzXBrYkrw964xWbo2O4m5A91PohkyGkj8=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "7fcfd9b565a470ccd43cd826d650931d660777fe",
+        "rev": "0a6227d667d1d2bc6a79de24fd12becc523f2e2f",
         "type": "github"
       },
       "original": {
@@ -53,11 +53,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1617784895,
-        "narHash": "sha256-gJOCUkf2Y1T8lFFjgw1zsNM+f0yQ1YEq3p31P8YUHHY=",
+        "lastModified": 1618388647,
+        "narHash": "sha256-qs2LLMWfFI51MiSyt4azliM6tdBgaIonRqD7Oq8Nxjk=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "de679c57ca579974f35fab5444c7892ceb16230a",
+        "rev": "b3d70196ea1b4586414122ae1aadff5c37ef9611",
         "type": "github"
       },
       "original": {
@@ -80,11 +80,11 @@
         "flake-utils": "flake-utils"
       },
       "locked": {
-        "lastModified": 1616960210,
-        "narHash": "sha256-4cnmFczcV2Rsv8oWauUhoHQMZak4xS1CKnqf1a3s//I=",
+        "lastModified": 1618392274,
+        "narHash": "sha256-kX7Hpn/nl//eWDa1QzkiSdbskdeH+HwWFP0iIo7gYH8=",
         "owner": "gytis-ivaskevicius",
         "repo": "flake-utils-plus",
-        "rev": "6d6f6137a818fabdc0e296395480851d8f36ffce",
+        "rev": "0b101bd6b34ed4b44d6d0126d2508d68801f1ba3",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index c3086696..b5cd643d 100644
--- a/flake.nix
+++ b/flake.nix
@@ -18,20 +18,22 @@
       patches = [ ];
     };
     sharedOverlays = [ emacs-overlay.overlay ];
-    sharedModules = [
-      ({ lib, ... }: {
-        environment.etc = lib.mapAttrs' (key: val: { name = "channels/${key}"; value = { source = val.outPath; }; }) inputs;
-        nix.nixPath = [ "/etc/channels" ];
-      })
-      utils.nixosModules.saneFlakeDefaults
-      home-manager.nixosModules.home-manager
-      ./modules
-    ];
-    nixosProfiles = {
-      kharbranth = { modules = [ ./machines/kharbranth ]; };
-      kholinar = { modules = [ ./machines/kholinar ]; };
-      lasting-integrity = { modules = [ ./machines/lasting-integrity ]; };
-      urithiru = { modules = [ ./machines/urithiru ]; };
+    hostDefaults = {
+      modules = [
+        ({ lib, ... }: {
+          environment.etc = lib.mapAttrs' (key: val: { name = "channels/${key}"; value = { source = val.outPath; }; }) inputs;
+          nix.nixPath = [ "/etc/channels" ];
+        })
+        utils.nixosModules.saneFlakeDefaults
+        home-manager.nixosModules.home-manager
+        ./modules
+      ];
+    };
+    hosts = {
+      kharbranth.modules = [ ./machines/kharbranth ];
+      kholinar.modules = [ ./machines/kholinar ];
+      lasting-integrity.modules = [ ./machines/lasting-integrity ];
+      urithiru.modules = [ ./machines/urithiru ];
     };
     devShellBuilder = channels:
       let pkgs = channels.nixpkgs; in pkgs.mkShell { buildInputs = [ pkgs.nixpkgs-fmt ]; };