diff --git a/flake.lock b/flake.lock
index 1a34815..d64617f 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,37 +1,5 @@
 {
   "nodes": {
-    "flake-utils": {
-      "locked": {
-        "lastModified": 1610051610,
-        "narHash": "sha256-U9rPz/usA1/Aohhk7Cmc2gBrEEKRzcW4nwPWMPwja4Y=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "3982c9903e93927c2164caa727cd3f6a0e6d14cc",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
-    "myuids": {
-      "locked": {
-        "dir": "flakes/myuids",
-        "lastModified": 1611091761,
-        "narHash": "sha256-fE3FBeUxVaMezKjEpepdQW9apOza+0AfBALFhaaD0VA=",
-        "ref": "master",
-        "rev": "23f9fdf03a6673dbe334ae33be4f498cc4753191",
-        "revCount": 802,
-        "type": "git",
-        "url": "https://git.immae.eu/perso/Immae/Config/Nix.git"
-      },
-      "original": {
-        "dir": "flakes/myuids",
-        "type": "git",
-        "url": "https://git.immae.eu/perso/Immae/Config/Nix.git"
-      }
-    },
     "nixpkgs": {
       "locked": {
         "lastModified": 1620340338,
@@ -50,64 +18,58 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1611097871,
-        "narHash": "sha256-Q6bUkno5JNt0OoyXThFDrKArFBp/GryvJhwEgVzGSuk=",
+        "lastModified": 1607522989,
+        "narHash": "sha256-o/jWhOSAlaK7y2M57OIriRt6whuVVocS/T0mG7fd1TI=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "31f5dd3f3655fbedac19f64f77844aa5ed79501c",
+        "rev": "e9158eca70ae59e73fae23be5d13d3fa0cfc78b4",
         "type": "github"
       },
       "original": {
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "peertube": {
-      "inputs": {
-        "flake-utils": "flake-utils",
-        "myuids": "myuids",
-        "nixpkgs": "nixpkgs_2",
-        "peertube": "peertube_2"
-      },
-      "locked": {
-        "dir": "flakes/peertube",
-        "lastModified": 1611273483,
-        "narHash": "sha256-VKDczZDM9A2dGoSAEN6rUDxvLKYUuoDMefQc7fabvXo=",
-        "ref": "master",
-        "rev": "ded643e14096a7cb166c78dd961cf68fb4ddb0cf",
-        "revCount": 805,
-        "type": "git",
-        "url": "https://git.immae.eu/perso/Immae/Config/Nix.git?dir=flakes%2fpeertube"
-      },
-      "original": {
-        "dir": "flakes/peertube",
-        "rev": "ded643e14096a7cb166c78dd961cf68fb4ddb0cf",
-        "type": "git",
-        "url": "https://git.immae.eu/perso/Immae/Config/Nix.git?dir=flakes%2fpeertube"
-      }
-    },
-    "peertube_2": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1610436329,
-        "narHash": "sha256-bIXt5bQiBBlNDFXYzcdQA8qp4nse5epUx/XQOguDOX8=",
-        "owner": "Chocobozzz",
-        "repo": "PeerTube",
-        "rev": "69e0e678beb7f1a3b6753eeff585a14f9a61ea86",
-        "type": "github"
-      },
-      "original": {
-        "owner": "Chocobozzz",
-        "ref": "v3.0.1",
-        "repo": "PeerTube",
-        "type": "github"
+        "id": "nixpkgs",
+        "ref": "nixos-unstable",
+        "type": "indirect"
       }
     },
     "root": {
       "inputs": {
         "nixpkgs": "nixpkgs",
-        "peertube": "peertube"
+        "simple-nixos-mailserver": "simple-nixos-mailserver"
+      }
+    },
+    "simple-nixos-mailserver": {
+      "inputs": {
+        "nixpkgs": "nixpkgs_2",
+        "utils": "utils"
+      },
+      "locked": {
+        "lastModified": 1619850087,
+        "narHash": "sha256-UVVge/7R/4afO+hp+T6MOiZJjMH8LS3VNXEWiRIRPcA=",
+        "owner": "simple-nixos-mailserver",
+        "repo": "nixos-mailserver",
+        "rev": "8b287056215cac91438a671054e7eb2c932ab21a",
+        "type": "gitlab"
+      },
+      "original": {
+        "owner": "simple-nixos-mailserver",
+        "ref": "master",
+        "repo": "nixos-mailserver",
+        "type": "gitlab"
+      }
+    },
+    "utils": {
+      "locked": {
+        "lastModified": 1605370193,
+        "narHash": "sha256-YyMTf3URDL/otKdKgtoMChu4vfVL3vCMkRqpGifhUn0=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "5021eac20303a61fafe17224c087f5519baed54d",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
       }
     }
   },
diff --git a/flake.nix b/flake.nix
index 9f7a797..275fcc4 100644
--- a/flake.nix
+++ b/flake.nix
@@ -4,7 +4,7 @@
     simple-nixos-mailserver.url = "gitlab:simple-nixos-mailserver/nixos-mailserver/master";
   };
 
-  outputs = { self, nixpkgs, peertube }: {
+  outputs = { self, nixpkgs, simple-nixos-mailserver }: {
 
     nixosConfigurations = {
       "reg" = nixpkgs.lib.nixosSystem {