diff --git a/nixos/common/hm-modules/vscode.nix b/nixos/common/hm-modules/vscode.nix
index 4e003815..1cc5dd91 100644
--- a/nixos/common/hm-modules/vscode.nix
+++ b/nixos/common/hm-modules/vscode.nix
@@ -70,6 +70,7 @@ in {
           sumneko.lua
           davidlday.languagetool-linter
           serayuzgur.crates
+          skellock.just
         ];
     };
 
diff --git a/nixos/hosts/hades/mastodon/configuration.nix b/nixos/hosts/hades/mastodon/configuration.nix
index 6f3fe3ed..9251cad5 100644
--- a/nixos/hosts/hades/mastodon/configuration.nix
+++ b/nixos/hosts/hades/mastodon/configuration.nix
@@ -31,6 +31,12 @@ in
     EOF
   '';
 
+  services.postgresql = {
+    enable = true;
+    package = pkgs.postgresql_16;
+    # The rest of the database setup is handled by mastodon
+  };
+
   services.mastodon = {
     enable = true;
     package = pkgs.v.glitch-soc;
@@ -54,14 +60,7 @@ in
       inherit (config.services.elasticsearch) port;
     };
 
-    database = {
-      createLocally = false;
-      user = "mastodon";
-      passwordFile = "${vs.mastodon}/db-password";
-      port = 5432;
-      name = "mastodon";
-      host = "192.168.0.126";
-    };
+    database.createLocally = true;
 
     smtp = {
       createLocally = false;