diff --git a/cachix.nix b/cachix.nix
index cce90a32..64734c30 100644
--- a/cachix.nix
+++ b/cachix.nix
@@ -1,4 +1,3 @@
-
 # WARN: this file will get overwritten by $ cachix use <name>
 { pkgs, lib, ... }:
 
@@ -6,9 +5,9 @@ let
   folder = ./cachix;
   toImport = name: value: folder + ("/" + name);
   filterCaches = key: value: value == "regular" && lib.hasSuffix ".nix" key;
-  imports = lib.mapAttrsToList toImport (lib.filterAttrs filterCaches (builtins.readDir folder));
+  imports = lib.mapAttrsToList toImport
+    (lib.filterAttrs filterCaches (builtins.readDir folder));
 in {
   inherit imports;
-  nix.binaryCaches = ["https://cache.nixos.org/"];
+  nix.binaryCaches = [ "https://cache.nixos.org/" ];
 }
-    
\ No newline at end of file
diff --git a/common/lib.nix b/common/lib.nix
index 3848aeb9..4d9f6836 100644
--- a/common/lib.nix
+++ b/common/lib.nix
@@ -1,4 +1,4 @@
-let
+rec {
   pkgs = import <nixpkgs> {};
   unstable = import <unstable> {};
   sources = import ../nix/sources.nix;
@@ -6,6 +6,10 @@ let
     broken = false;
     doCheck = false;
   });
+  shh-extras = unstable.haskell.lib.overrideCabal unstable.haskellPackages.shh-extras (drv: {
+    broken = false;
+    doCheck = false;
+  });
   haskellList = list: ''["${builtins.concatStringsSep ''", "'' list}"]'';
   writeHaskellScript = { name ? "haskell-script", bins ? [pkgs.coreutils], libraries ? [], imports ? []}: code:
     unstable.writers.writeHaskellBin name { libraries = libraries ++ [shh unstable.haskellPackages.string-interpolate ]; } ''
@@ -46,9 +50,6 @@ let
           nix_build ["-Q", "-E", expr, "--no-out-link"] &> devNull
           nix_instantiate ["--eval", "-E", [i|toString #{expr}|]] |> trimQuotation
     '';
-in {
-  inherit writeHaskellScript get-niv-path unstable sources haskellList;
-  niv = (import sources.niv {}).niv;
   home-manager = pkgs.callPackage <home-manager/home-manager> {};
   gcRetentionDays = 5;
 }
diff --git a/common/pkgs.nix b/common/pkgs.nix
index b065e858..44c18670 100644
--- a/common/pkgs.nix
+++ b/common/pkgs.nix
@@ -1,15 +1,13 @@
 rec {
-  inherit (import ../common/lib.nix) niv;
-  pkgs = import <nixpkgs> {};
-  unstable = import <unstable> {};
-  lorriSrc = (import ../nix/sources.nix).lorri;
-  lorri = import lorriSrc { src = lorriSrc; pkgs = unstable; };
+  my-lib = import ../common/lib.nix;
+  inherit (my-lib) pkgs unstable sources;
   tasktree = pkgs.callPackage ../packages/tasktree {};
   neovim = pkgs.neovim.override {
       vimAlias = true;
       withPython3 = true;
     };
   home-neovim = (import ../home-manager/nvim) neovim;
+  niv = (import sources.niv {}).niv;
 
   # pkgs assumed to be present on a non nixos host
   core-system-pkgs = {
@@ -35,7 +33,8 @@ rec {
   };
 
   extra-system-pkgs = {
-    inherit lorri niv;
+    lorri = import sources.lorri { src = sources.lorri; pkgs = unstable; };
+    inherit niv;
     inherit (pkgs.gitAndTools) git-annex;
     inherit (pkgs.rxvt_unicode) terminfo;
     inherit (pkgs.pythonPackages) qrcode;
@@ -81,8 +80,8 @@ rec {
       sleep 0.1s;
       nmcli r wifi on;
     '';
-    cachix = import (import ../nix/sources.nix).cachix {};
-    nixfmt = import (import ../nix/sources.nix).nixfmt {};
+    cachix = import sources.cachix {};
+    nixfmt = import sources.nixfmt {};
     inherit (pkgs.gnome3) nautilus;
     inherit (unstable.haskellPackages) brittany;
     inherit (pkgs.xorg) xev xbacklight;
@@ -160,6 +159,7 @@ rec {
   };
 home-pkgs = {
   inherit (pkgs) ncmpcpp;
+  inherit (my-lib) shh;
   inherit home-neovim;
 };
 accounting-pkgs = {