diff --git a/modules/common/custom-options.nix b/modules/common/custom-options.nix
index c55d401..294369c 100644
--- a/modules/common/custom-options.nix
+++ b/modules/common/custom-options.nix
@@ -16,7 +16,7 @@ in {
 
     isServer = mkOption {
       type = types.bool;
-      default = config.nixpkgs.hostPlatform.isAarch64 && config.nixpkgs.hostPlatform.system == "aarch64-linux";
+      default = config.nixpkgs.hostPlatform.isAarch64 && config.nixpkgs.hostPlatform.isLinux;
       description = "Whether the system is a server. Determined by the processor architecture.";
     };
 
diff --git a/modules/common/ghostty.nix b/modules/common/ghostty.nix
index 9181659..8e52f7b 100644
--- a/modules/common/ghostty.nix
+++ b/modules/common/ghostty.nix
@@ -1,4 +1,4 @@
-{ pkgs, config, ... }: {
+{ pkgs, config, ghostty, ... }: {
   environment.variables = {
     TERMINAL = "ghostty";
   };
@@ -6,7 +6,7 @@
   home-manager.sharedModules = [{
     programs.ghostty = {
       enable = true;
-      package = if config.onLinux then pkgs.ghostty else null;
+      package = if config.onLinux then ghostty.packages.${pkgs.stdenv.hostPlatform.system}.default else null;
 
       clearDefaultKeybinds = false;
       settings = {
diff --git a/modules/linux/xserver.nix b/modules/linux/xserver.nix
index 55e7724..25ffe69 100644
--- a/modules/linux/xserver.nix
+++ b/modules/linux/xserver.nix
@@ -398,7 +398,7 @@
 
   environment.systemPackages = with pkgs; [
     fuzzel
-    xfce.thunar
+    thunar
     playerctl
     wireplumber
     yaziPlugins.wl-clipboard
@@ -437,7 +437,7 @@
     #     feh
     #     picom # transparency effects compositor
     #     dunst # notification daemon
-    #     xfce.thunar
+    #     thunar
     #     nemo
     #     arandr # screen conf
     #     lxappearance