diff --combined www/sites/all/modules/uuid_features/includes/uuid_node.features.inc
index 6fb7bfa,e44c3e1..0000000
--- a/www/sites/all/modules/uuid_features/includes/uuid_node.features.inc
+++ b/www/sites/all/modules/uuid_features/includes/uuid_node.features.inc
@@@ -35,9 -35,9 +35,9 @@@ function uuid_node_features_export($dat
  
    uuid_features_load_module_includes();
  
 -  foreach ($data as $uuid) {
 +  $nids = entity_get_id_by_uuid('node', $data);
 +  foreach ($nids as $uuid => $nid) {
      // Load the existing node, with a fresh cache.
 -    $nid = uuid_node_find($uuid);
      $node = node_load($nid, NULL, TRUE);
  
      $export['features']['uuid_node'][$uuid] = $uuid;
@@@ -66,9 -66,9 +66,9 @@@ function uuid_node_features_export_rend
  
    $code[] = '  $nodes = array();';
    $code[] = '';
 -  foreach ($data as $uuid) {
 +  $nids = entity_get_id_by_uuid('node', $data);
 +  foreach ($nids as $uuid => $nid) {
      // Only export the node if it exists.
 -    $nid = uuid_node_find($uuid);
      if ($nid === FALSE) {
        continue;
      }
@@@ -128,15 -128,12 +128,15 @@@ function uuid_node_features_rebuild($mo
        node_object_prepare($node);
  
        // Find the matching UUID, with a fresh cache.
 -      $nid = uuid_node_find($node->uuid);
 -      $existing = node_load($nid, NULL, TRUE);
 -
 -      if (!empty($existing)) {
 -        $node->nid = $existing->nid;
 -        $node->vid = $existing->vid;
 +      $nids = entity_get_id_by_uuid('node', array($node->uuid));
 +      $nid = $nids[$node->uuid];
 +      if(!empty($nid)) {
 +          $existing = node_load($nid, NULL, TRUE);
 +
 +          if (!empty($existing)) {
 +            $node->nid = $existing->nid;
 +            $node->vid = $existing->vid;
 +          }
        }
  
        // The hook_alter signature is: