diff --git a/.gitmodules b/.gitmodules
index e95bc711..3eb49ffe 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,3 @@
 [submodule "secrets"]
 	path = secrets
 	url = ssh://git@gitea.c3d2.de:2222/c3d2-admins/secrets.git
-[submodule "overlays/yggdrasil-package-nix"]
-	path = overlays/yggdrasil-package-nix
-	url = https://github.com/ehmry/yggdrasil-package-nix.git
diff --git a/hosts/glotzbert/configuration.nix b/hosts/glotzbert/configuration.nix
index af89d3b1..b9bf9264 100644
--- a/hosts/glotzbert/configuration.nix
+++ b/hosts/glotzbert/configuration.nix
@@ -19,6 +19,7 @@ in
       ../../lib/default-gateway.nix
       ../../lib/hail.nix
       ../../lib/hq.nix
+      ../../lib/yggdrasil.nix
     ];
 
   # Use the systemd-boot EFI boot loader.
diff --git a/hosts/hydra/configuration.nix b/hosts/hydra/configuration.nix
index a14ccc44..b67ef6de 100644
--- a/hosts/hydra/configuration.nix
+++ b/hosts/hydra/configuration.nix
@@ -10,7 +10,7 @@
     ./../../lib/yggdrasil.nix
   ];
 
-  services.yggdrasil.config.Peers = [
+  services.yggdrasil.Peers = [
     "tcp://[2a03:3b40:fe:ab::1]:46370" # Praha
     "tcp://ygg.thingylabs.io:443" # Nürnberg
     "tcp://176.223.130.120:22632" # Wrocław
diff --git a/lib/yggdrasil.nix b/lib/yggdrasil.nix
index b21afb5c..a450726b 100644
--- a/lib/yggdrasil.nix
+++ b/lib/yggdrasil.nix
@@ -1,11 +1,13 @@
 { config, ... }: {
 
+  imports = [ (<yggdrasil-package-nix> + "/nixos-module.nix") ];
+
   networking.firewall.extraCommands =
     "ip6tables -A INPUT -s fe80::/10 -j ACCEPT";
 
   services.yggdrasil = {
     enable = true;
-    config.NodeInfo = {
+    NodeInfo = {
       name = config.networking.hostName + ".c3d2";
       location = "Dresden";
     };
diff --git a/overlays/yggdrasil-package-nix b/overlays/yggdrasil-package-nix
deleted file mode 160000
index a0ee4516..00000000
--- a/overlays/yggdrasil-package-nix
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit a0ee45162f90401acc52f929a7544838ec13a309