diff --git a/flake.nix b/flake.nix
index 4b3339d..0abd8f7 100644
--- a/flake.nix
+++ b/flake.nix
@@ -62,6 +62,7 @@
       "gabe@archlaptop" = import ./hosts/home-personal.nix {inherit inputs outputs;};
       "gabe@linuxgamingrig" = import ./hosts/home-personal.nix {inherit inputs outputs;};
       "gabe@gv-workstation" = import ./hosts/home-workstation.nix {inherit inputs outputs;};
+      "gabe@gv-ubuntu" = import ./hosts/home-workstation.nix {inherit inputs outputs;};
     };
   };
 }
diff --git a/hosts/archlaptop-vm/default.nix b/hosts/archlaptop-vm/default.nix
index 64c50df..28e0c02 100644
--- a/hosts/archlaptop-vm/default.nix
+++ b/hosts/archlaptop-vm/default.nix
@@ -18,7 +18,7 @@ inputs.nixpkgs.lib.nixosSystem {
     ../../modules/nixos/common.nix
     ../../modules/nixos/printing.nix
     ../../modules/both/sound.nix
-    ../../modules/both/networking.nix
+    ../../modules/nixos/networking.nix
     ../../modules/both/i3
     ({
       config,
@@ -64,7 +64,6 @@ inputs.nixpkgs.lib.nixosSystem {
       }: {
         host = osConfig.host;
         home = {
-          enable-speech = true;
           git = {
             profile = {
               name = "Gabe Venberg";
diff --git a/hosts/home-workstation.nix b/hosts/home-workstation.nix
index 65e717a..f3e0d06 100644
--- a/hosts/home-workstation.nix
+++ b/hosts/home-workstation.nix
@@ -39,9 +39,6 @@ inputs.home-manager.lib.homeManagerConfiguration {
         ../roles/home-manager/terminal.nix
         ../modules/home-manager/common.nix
         ../modules/home-manager/syncthing.nix
-        ../modules/home-manager/email.nix
-        ../modules/home-manager/beets.nix
-        ../modules/home-manager/mpd/mpd.nix
       ];
     })
   ];
diff --git a/hosts/workstation-vm/default.nix b/hosts/workstation-vm/default.nix
index 58bdad6..a517e9f 100644
--- a/hosts/workstation-vm/default.nix
+++ b/hosts/workstation-vm/default.nix
@@ -64,7 +64,6 @@ inputs.nixpkgs.lib.nixosSystem {
       }: {
         host = osConfig.host;
         home = {
-          enable-speech = true;
           nvim = {
             enable-lsp = true;
             enable-treesitter = true;