diff --git a/hosts/architect/matrix.nix b/hosts/architect/matrix.nix
index 8ab4396..49d5f66 100644
--- a/hosts/architect/matrix.nix
+++ b/hosts/architect/matrix.nix
@@ -45,11 +45,11 @@ in {
 
     postgresql = {
       enable = true;
-      package = pkgs.postgresql_11;
+      package = pkgs.postgresql;
       ensureDatabases = [ db_name ];
       ensureUsers = [{
         name = db_name;
-        ensurePermissions = { "DATABASE ${db_name}" = "ALL PRIVILEGES"; };
+        ensurePermissions = { "DATABASE \"${db_name}\"" = "ALL PRIVILEGES"; };
       }];
     };