diff --git a/domain_path.module b/domain_path.module
index cb9a3a8..694bc28 100644
--- a/domain_path.module
+++ b/domain_path.module
@@ -33,7 +33,7 @@ function domain_path_domain_path($domain_id, &$path, &$options, $original_path)
   $alias = $path;
   $paths = domain_path_paths('alias');
   if (isset($paths[$path][$did])) {
-    $alias = $paths[$path][$did];
+    $alias = $paths[$path][$did]->source;
     $nid = arg(1, $alias);
   }
   else {
@@ -46,8 +46,8 @@ function domain_path_domain_path($domain_id, &$path, &$options, $original_path)
     return;
   }
   $paths = domain_path_paths('nid', $nid);
-  if (isset($paths[$domain_id])) {
-    $path = $paths[$domain_id];
+  if (isset($paths[$domain_id]->alias)) {
+    $path = $paths[$domain_id]->alias;
   }
   else {
     $path = drupal_get_path_alias($alias);
@@ -62,10 +62,10 @@ function domain_path_url_inbound_alter(&$path, $original_path, $path_language) {
   $domain = domain_get_domain();
   $did = $domain['domain_id'];
   $paths = domain_path_paths('alias');
-  if (!isset($paths[$original_path][$did])) {
+  if (!isset($paths[$original_path][$did]->source)) {
     return;
   }
-  $path = $paths[$original_path][$did];
+  $path = $paths[$original_path][$did]->source;
 }
 
 /**
@@ -119,10 +119,10 @@ function domain_path_paths($key = 'nid', $nid = NULL) {
       $paths = array('nid' => array(), 'alias' => array());
       // TODO: better handling for different entities.
       // TODO: Language support!
-      $result = db_query("SELECT domain_id, source, alias, language, entity_type, entity_id FROM {domain_path} WHERE entity_type = 'node'");
+      $result = db_query("SELECT dpid, domain_id, source, alias, language, entity_type, entity_id FROM {domain_path} WHERE entity_type = 'node'");
       foreach ($result as $path) {
-        $paths['nid'][$path->entity_id][$path->domain_id] = $path->alias;
-        $paths['alias'][$path->alias][$path->domain_id] = $path->source;
+        $paths['nid'][$path->entity_id][$path->domain_id] = $path;
+        $paths['alias'][$path->alias][$path->domain_id] = $path;
       }
       // Cache for performance.
       // TODO: test.
@@ -184,7 +184,7 @@ function domain_path_form_node_form_alter(&$form, $form_state) {
     $form['domain_path'][$domain_id] = array(
       '#type' => 'textfield',
       '#title' => check_plain($domain['path']),
-      '#default_value' => isset($paths[$domain_id]) ? $paths[$domain_id] : $default,
+      '#default_value' => isset($paths[$domain_id]->alias) ? $paths[$domain_id]->alias : $default,
       '#access' => user_access('edit domain paths'),
     );
   }