diff --git a/common/src/db/machine_repository.cpp b/common/src/db/machine_repository.cpp
index f504f99..2a600eb 100644
--- a/common/src/db/machine_repository.cpp
+++ b/common/src/db/machine_repository.cpp
@@ -30,3 +30,11 @@ std::vector<MachineData> MachineRepository::get_all_npcs(void) {
     };
   return machines;
 }
+
+std::string MachineRepository::get_hostname(long long machine_id) {
+  std::string hostname;
+  _db << "SELECT hostname FROM machines WHERE id = ?;"
+      << machine_id
+      >> hostname;
+  return hostname;
+}
diff --git a/common/src/db/machine_repository.h b/common/src/db/machine_repository.h
index 1303ee5..ab45768 100644
--- a/common/src/db/machine_repository.h
+++ b/common/src/db/machine_repository.h
@@ -19,6 +19,7 @@ public:
                    const std::string& ip_address);
   int get_npc_count(void);
   std::vector<MachineData> get_all_npcs(void);
+  std::string get_hostname(long long machine_id);
 
 private:
   sqlite::database& _db;
diff --git a/common/src/machine_manager.cpp b/common/src/machine_manager.cpp
index e9db8c9..b94eea9 100644
--- a/common/src/machine_manager.cpp
+++ b/common/src/machine_manager.cpp
@@ -98,11 +98,8 @@ void build_tree(vfs_node* parent, const std::map<long long, vfs_node*>& nodes) {
 
 Machine* MachineManager::load_machine(long long machine_id, DatabaseManager* db_manager) {
   printf("DEBUG: load_machine called for machine_id: %lld\n", machine_id);
-  std::string hostname;
 
-  db_manager->_db << "SELECT hostname FROM machines WHERE id = ?;"
-         << machine_id
-         >> hostname;
+  std::string hostname = _db_manager->machines().get_hostname(machine_id);
 
   Machine* machine = new Machine(machine_id, hostname);