diff --git a/flake.lock b/flake.lock
index 91bb50c..7b62fa7 100644
--- a/flake.lock
+++ b/flake.lock
@@ -637,15 +637,15 @@
         "host": "gitlab.skynet.ie",
         "lastModified": 1696865182,
         "narHash": "sha256-zyUUOA+RiwRjLP6+zi80p5pqftYK3+9yIN5wQ9VlGkw=",
-        "owner": "compsoc1%2Fskynet%2Fmisc",
-        "repo": "nixos-mailserver",
+        "owner": "compsoc1%2Fskynet",
+        "repo": "misc%2Fnixos-mailserver",
         "rev": "14007ae0eaeba4cc0235135f872122e398f09040",
         "type": "gitlab"
       },
       "original": {
         "host": "gitlab.skynet.ie",
-        "owner": "compsoc1%2Fskynet%2Fmisc",
-        "repo": "nixos-mailserver",
+        "owner": "compsoc1%2Fskynet",
+        "repo": "misc%2Fnixos-mailserver",
         "type": "gitlab"
       }
     },
@@ -681,15 +681,15 @@
         "host": "gitlab.skynet.ie",
         "lastModified": 1695854857,
         "narHash": "sha256-EyToHIEHft60vKRkndP5siyq17W+vJmqA/dug80WZgM=",
-        "owner": "compsoc1%2Fskynet%2Fldap",
-        "repo": "backend",
+        "owner": "compsoc1%2Fskynet",
+        "repo": "ldap%2Fbackend",
         "rev": "9db8a238d2bf7be8bcfa86012b26180c041c13d1",
         "type": "gitlab"
       },
       "original": {
         "host": "gitlab.skynet.ie",
-        "owner": "compsoc1%2Fskynet%2Fldap",
-        "repo": "backend",
+        "owner": "compsoc1%2Fskynet",
+        "repo": "ldap%2Fbackend",
         "type": "gitlab"
       }
     },
@@ -702,15 +702,15 @@
         "host": "gitlab.skynet.ie",
         "lastModified": 1695858897,
         "narHash": "sha256-mXTqtdScfpqYG+6qDC7NpDCy91gmviXtjxEbnR31TCU=",
-        "owner": "compsoc1%2Fskynet%2Fldap",
-        "repo": "frontend",
+        "owner": "compsoc1%2Fskynet",
+        "repo": "ldap%2Ffrontend",
         "rev": "63388a8d1cfcfc020d307aca07af09d165ef7d18",
         "type": "gitlab"
       },
       "original": {
         "host": "gitlab.skynet.ie",
-        "owner": "compsoc1%2Fskynet%2Fldap",
-        "repo": "frontend",
+        "owner": "compsoc1%2Fskynet",
+        "repo": "ldap%2Ffrontend",
         "type": "gitlab"
       }
     },
@@ -723,15 +723,15 @@
         "host": "gitlab.skynet.ie",
         "lastModified": 1696876711,
         "narHash": "sha256-WdZQBLTX6WK8iT7FwvD6sNEefGwtAWmzxZzCvvmDxGo=",
-        "owner": "compsoc1%2Fskynet%2Fwebsite",
-        "repo": "2023",
+        "owner": "compsoc1%2Fskynet",
+        "repo": "website%2F2023",
         "rev": "c4d61c753292bf73ed41b47b1607cfc92a82a191",
         "type": "gitlab"
       },
       "original": {
         "host": "gitlab.skynet.ie",
-        "owner": "compsoc1%2Fskynet%2Fwebsite",
-        "repo": "2023",
+        "owner": "compsoc1%2Fskynet",
+        "repo": "website%2F2023",
         "type": "gitlab"
       }
     },
@@ -744,15 +744,15 @@
         "host": "gitlab.skynet.ie",
         "lastModified": 1690726067,
         "narHash": "sha256-/BrljRmgR65bdqWgGBBWlTFiBzr0EBh1OeMlLj+xTg4=",
-        "owner": "compsoc1%2Fskynet%2Fwebsite",
-        "repo": "2016",
+        "owner": "compsoc1%2Fskynet",
+        "repo": "website%2F2016",
         "rev": "63e0b33c5a48cbd4e68f23dde4987959b6c8e97e",
         "type": "gitlab"
       },
       "original": {
         "host": "gitlab.skynet.ie",
-        "owner": "compsoc1%2Fskynet%2Fwebsite",
-        "repo": "2016",
+        "owner": "compsoc1%2Fskynet",
+        "repo": "website%2F2016",
         "type": "gitlab"
       }
     },
@@ -765,15 +765,15 @@
         "host": "gitlab.skynet.ie",
         "lastModified": 1696129767,
         "narHash": "sha256-cO9zQNOQKHcaepetJEmWTEM0DJLm+NLvAUpR05TEoqQ=",
-        "owner": "compsoc1%2Fskynet%2Fwebsite",
-        "repo": "games.skynet.ie",
+        "owner": "compsoc1%2Fskynet",
+        "repo": "website%2Fgames.skynet.ie",
         "rev": "d5b6a87df665c1ac0cb7ec39acc088a3de703c60",
         "type": "gitlab"
       },
       "original": {
         "host": "gitlab.skynet.ie",
-        "owner": "compsoc1%2Fskynet%2Fwebsite",
-        "repo": "games.skynet.ie",
+        "owner": "compsoc1%2Fskynet",
+        "repo": "website%2Fgames.skynet.ie",
         "type": "gitlab"
       }
     },
@@ -786,15 +786,15 @@
         "host": "gitlab.skynet.ie",
         "lastModified": 1696453842,
         "narHash": "sha256-q33InJdgtxep17k5rXLNLunxC9Jdvv5nC0Hc+2NxMZA=",
-        "owner": "compsoc1%2Fskynet%2Fwebsite",
-        "repo": "alumni-renew",
+        "owner": "compsoc1%2Fskynet",
+        "repo": "website%2Falumni-renew",
         "rev": "0e5ddb75723fc3baae19611114cb59b4673d48e0",
         "type": "gitlab"
       },
       "original": {
         "host": "gitlab.skynet.ie",
-        "owner": "compsoc1%2Fskynet%2Fwebsite",
-        "repo": "alumni-renew",
+        "owner": "compsoc1%2Fskynet",
+        "repo": "website%2Falumni-renew",
         "type": "gitlab"
       }
     },
diff --git a/flake.nix b/flake.nix
index 0b8cf47..2118910 100644
--- a/flake.nix
+++ b/flake.nix
@@ -18,17 +18,62 @@
 
     # email
     # simple-nixos-mailserver.url = "gitlab:simple-nixos-mailserver/nixos-mailserver";
-    simple-nixos-mailserver.url = "gitlab:compsoc1%2Fskynet%2Fmisc/nixos-mailserver?host=gitlab.skynet.ie";
+    simple-nixos-mailserver = {
+      type = "gitlab";
+      host = "gitlab.skynet.ie";
+      owner = "compsoc1%2Fskynet";
+      repo = "misc%2Fnixos-mailserver";
+    };
 
     # account.skynet.ie
-    skynet_ldap_backend.url = "gitlab:compsoc1%2Fskynet%2Fldap/backend?host=gitlab.skynet.ie";
-    skynet_ldap_frontend.url = "gitlab:compsoc1%2Fskynet%2Fldap/frontend?host=gitlab.skynet.ie";
-    skynet_website.url = "gitlab:compsoc1%2Fskynet%2Fwebsite/2023?host=gitlab.skynet.ie";
-    skynet_website_2016.url = "gitlab:compsoc1%2Fskynet%2Fwebsite/2016?host=gitlab.skynet.ie";
-    skynet_website_renew.url = "gitlab:compsoc1%2Fskynet%2Fwebsite/alumni-renew?host=gitlab.skynet.ie";
-    skynet_website_games.url = "gitlab:compsoc1%2Fskynet%2Fwebsite/games.skynet.ie?host=gitlab.skynet.ie";
-    skynet_discord_bot.url = "gitlab:compsoc1%2Fskynet/discord-bot?host=gitlab.skynet.ie";
-    compsoc_public.url = "gitlab:compsoc1%2Fcompsoc/presentations?host=gitlab.skynet.ie";
+    skynet_ldap_backend = {
+      type = "gitlab";
+      host = "gitlab.skynet.ie";
+      owner = "compsoc1%2Fskynet";
+      repo = "ldap%2Fbackend";
+    };
+    skynet_ldap_frontend = {
+      type = "gitlab";
+      host = "gitlab.skynet.ie";
+      owner = "compsoc1%2Fskynet";
+      repo = "ldap%2Ffrontend";
+    };
+    skynet_website = {
+      type = "gitlab";
+      host = "gitlab.skynet.ie";
+      owner = "compsoc1%2Fskynet";
+      repo = "website%2F2023";
+    };
+    skynet_website_2016 = {
+      type = "gitlab";
+      host = "gitlab.skynet.ie";
+      owner = "compsoc1%2Fskynet";
+      repo = "website%2F2016";
+    };
+    skynet_website_renew = {
+      type = "gitlab";
+      host = "gitlab.skynet.ie";
+      owner = "compsoc1%2Fskynet";
+      repo = "website%2Falumni-renew";
+    };
+    skynet_website_games = {
+      type = "gitlab";
+      host = "gitlab.skynet.ie";
+      owner = "compsoc1%2Fskynet";
+      repo = "website%2Fgames.skynet.ie";
+    };
+    skynet_discord_bot = {
+      type = "gitlab";
+      host = "gitlab.skynet.ie";
+      owner = "compsoc1%2Fskynet";
+      repo = "discord-bot";
+    };
+    compsoc_public = {
+      type = "gitlab";
+      host = "gitlab.skynet.ie";
+      owner = "compsoc1%2Fcompsoc";
+      repo = "presentations";
+    };
   };
 
   nixConfig.bash-prompt-suffix = "[Skynet Dev] ";