diff --git a/freya/configuration.nix b/freya/configuration.nix
index 20f8312..9ca1abc 100644
--- a/freya/configuration.nix
+++ b/freya/configuration.nix
@@ -48,23 +48,6 @@
     blueman.enable = true;
     dbus.packages = [ pkgs.dconf ];
     gnome.gnome-keyring.enable = true;
-    # nextcloud = {
-    #   enable = true;
-    #   hostName = "freya.local";
-    #   config.adminpassFile = config.age.secrets.nextcloud_admin_secret.path;
-    #   config.objectstore.s3 = {
-    #     enable = true;
-    #     bucket = "nextcloud-bucket";
-    #     autocreate = false;
-    #     key = "GK42a6b774429bfc254f4a5d36";
-    #     secretFile = config.age.secrets.nextcloud_bucket_secret.path;
-    #     hostname = "localhost";
-    #     port = 3900;
-    #     useSsl = false;
-    #     region = "garage";
-    #     usePathStyle = true;
-    #   };
-    # };
     openssh = { enable = true; openFirewall = true; };
     # xserver = {
     #   enable = true;
diff --git a/nixos_modules/garage.nix b/nixos_modules/garage.nix
index e59b51e..13327fd 100644
--- a/nixos_modules/garage.nix
+++ b/nixos_modules/garage.nix
@@ -1,14 +1,17 @@
-{ config, pkgs, ... }: {
+{ pkgs, config, lib, ... }: {
   users.groups.garage = { };
-  users.users.garage = {
-    isSystemUser = true;
-    group = "garage";
-  };
+  users.users.garage = { isSystemUser = true; group = "garage"; };
 
   networking.firewall.interfaces."ztmjfdwjkp".allowedTCPPorts = [
     3901
   ];
 
+  # Not correctly passing mount bindings
+  systemd.services.garage.serviceConfig = {
+    ProtectHome = lib.mkForce false;
+    DynamicUser = false;
+  };
+
   services.garage = {
     package = pkgs.unstable_pkgs.garage;
     enable = true;
diff --git a/nixos_modules/nextcloud.nix b/nixos_modules/nextcloud.nix
new file mode 100644
index 0000000..025dbe5
--- /dev/null
+++ b/nixos_modules/nextcloud.nix
@@ -0,0 +1,19 @@
+{ config, ... }: {
+  services.nextcloud = {
+    enable = true;
+    hostName = "freya.local";
+    config.adminpassFile = config.age.secrets.nextcloud_admin_secret.path;
+    config.objectstore.s3 = {
+      enable = true;
+      bucket = "nextcloud-bucket";
+      autocreate = false;
+      key = "GK42a6b774429bfc254f4a5d36";
+      secretFile = config.age.secrets.nextcloud_bucket_secret.path;
+      hostname = "localhost";
+      port = 3900;
+      useSsl = false;
+      region = "garage";
+      usePathStyle = true;
+    };
+  };
+}