diff --git a/default.nix b/default.nix
index b729bae..4679968 100644
--- a/default.nix
+++ b/default.nix
@@ -1,9 +1,7 @@
-let
+rec {
   sources = import ./nix/sources.nix;
   pkgs = import ./pkgs {};
-  hosts = import (sources.nix-hexchen + "/lib/hosts.nix") {inherit pkgs; hostsDir = ./hosts; commonImports = [./common]; pkgsPath = ./pkgs; };
-in {
-  inherit sources pkgs;
-  inherit (hosts) hosts groups;
-  deploy = import (sources.nix-hexchen + "/lib/deploy.nix") { inherit pkgs; inherit (hosts) hosts groups; };
+  inherit (pkgs) lib;
+  inherit (import (sources.nix-hexchen + "/lib/hosts.nix") { inherit pkgs; hostsDir = ./hosts; commonImports = [./common]; pkgsPath = ./pkgs; }) hosts groups;
+  deploy = import (sources.nix-hexchen + "/lib/deploy.nix") { inherit pkgs hosts groups; };
 }