diff --git a/default.nix b/default.nix
index c001b8c13..d62e43a1f 100644
--- a/default.nix
+++ b/default.nix
@@ -17,8 +17,10 @@ let stockholm = {
     let
       lib = import <nixpkgs/lib>;
       klib = import ./krebs/4lib { inherit lib; };
-      #ulib = import (./. + "/${current-user-name}/4lib") { lib = lib // klib; };
-      ulib = {}; # TODO
+      ulib = let
+        path = ./. + "/${current-user-name}/4lib";
+      in lib.optionalAttrs (klib.dir.has-default-nix path)
+                           (import path { lib = lib // klib; });
     in
     builtins // lib // klib // ulib // rec {
       # TODO move this stuff
diff --git a/tv/2configs/git.nix b/tv/2configs/git.nix
index 63d65a630..4387be36a 100644
--- a/tv/2configs/git.nix
+++ b/tv/2configs/git.nix
@@ -1,6 +1,7 @@
 { config, lib, pkgs, ... }:
 
-with import ../4lib { inherit lib pkgs; };
+with lib;
+
 let
 
   out = {