diff --git a/modules/cd/default.nix b/modules/cd/default.nix
index ca798f8e6..bdd6ccecb 100644
--- a/modules/cd/default.nix
+++ b/modules/cd/default.nix
@@ -8,7 +8,6 @@ in
   imports =
     [
       <secrets/hashedPasswords.nix>
-      ./git.nix
       ./iptables.nix
       ./networking.nix
       ../common/nixpkgs.nix
@@ -16,6 +15,7 @@ in
       ../tv/base-cac-CentOS-7-64bit.nix
       ../tv/ejabberd.nix # XXX echtes modul
       ../tv/exim-smarthost.nix
+      ../tv/git/public.nix
       ../tv/retiolum.nix
       ../tv/sanitize.nix
     ];
diff --git a/modules/cd/git.nix b/modules/tv/git/public.nix
similarity index 88%
rename from modules/cd/git.nix
rename to modules/tv/git/public.nix
index 42b0bc12e..7dc93e821 100644
--- a/modules/cd/git.nix
+++ b/modules/tv/git/public.nix
@@ -4,9 +4,9 @@ let
   inherit (builtins) map readFile;
   inherit (lib) concatMap listToAttrs;
   # TODO lib should already include our stuff
-  inherit (import ../../lib { inherit lib pkgs; }) addNames git;
+  inherit (import ../../../lib { inherit lib pkgs; }) addNames git;
 
-  cd-repos = [
+  public-git-repos = [
     (public "cgserver")
     (public "crude-mail-setup")
     (public "dot-xmonad")
@@ -30,9 +30,9 @@ let
     makefu = { pubkey = "xxx"; };
   };
 
-  repos = listToAttrs (map ({ repo, ... }: { name = repo.name; value = repo; }) cd-repos);
+  repos = listToAttrs (map ({ repo, ... }: { name = repo.name; value = repo; }) public-git-repos);
 
-  rules = concatMap ({ rules, ... }: rules) cd-repos;
+  rules = concatMap ({ rules, ... }: rules) public-git-repos;
 
   public = repo-name:
     rec {
@@ -63,7 +63,7 @@ in
 
 {
   imports = [
-    ../tv/git
+    ./.
   ];
 
   services.git = {