diff --git a/app/models/legacy/object.rb b/app/models/legacy/object.rb
index dc1c53d7b..04218cd09 100644
--- a/app/models/legacy/object.rb
+++ b/app/models/legacy/object.rb
@@ -1,6 +1,7 @@
 module Legacy
   class Object < Db
     self.table_name = :object
+    belongs_to :registrar, foreign_key: :upid, primary_key: :legacy_id, class_name: '::Registrar'
 
     def self.instance_method_already_implemented?(method_name)
       return true if method_name == 'update'
diff --git a/lib/tasks/import.rake b/lib/tasks/import.rake
index 8f5db7619..d7736f79c 100644
--- a/lib/tasks/import.rake
+++ b/lib/tasks/import.rake
@@ -189,9 +189,9 @@ namespace :import do
           x.object.authinfopw.try(:strip),
           name,
           x.organization.try(:strip),
-          x.object.try(:clid),
-          x.object_registry.try(:crid),
-          x.object.try(:upid) ? x.object.try(:upid) : x.object_registry.try(:crid),
+          x.object_registry.try(:registrar).try(:id),
+          user,
+          x.object.try(:registrar).try(:name) ? x.object.try(:registrar).try(:name) : x.object_registry.try(:registrar).try(:name),
           x.country.try(:strip),
           x.id,
           [x.street1.try(:strip), x.street2.try(:strip), x.street3.try(:strip)].join("\n"),
@@ -321,8 +321,8 @@ namespace :import do
           SimpleIDN.to_ascii(x.object_registry.name.try(:strip)),
           1,
           'y',
-          x.object_registry.try(:crid),
-          x.object.try(:upid) ? x.object.try(:upid) : x.object_registry.try(:crid),
+          user,
+          x.object.try(:registrar).try(:name) ? x.object.try(:registrar).try(:name) : x.object_registry.try(:registrar).try(:name),
           x.id,
           x.object_registry.try(:crid),
           x.registrant,
@@ -333,8 +333,8 @@ namespace :import do
         x.domain_contact_maps.each do |dc|
           domain_contacts << [
             'AdminDomainContact',
-            x.object_registry.try(:crid),
-            x.object.try(:upid) ? x.object.try(:upid) : x.object_registry.try(:crid),
+            user,
+            x.object.try(:registrar).try(:name) ? x.object.try(:registrar).try(:name) : x.object_registry.try(:registrar).try(:name),
             x.id,
             dc.contactid
           ]
@@ -344,8 +344,8 @@ namespace :import do
         x.nsset_contact_maps.each do |dc|
           domain_contacts << [
             'TechDomainContact',
-            x.object_registry.try(:crid),
-            x.object.try(:upid) ? x.object.try(:upid) : x.object_registry.try(:crid),
+            user,
+            x.object.try(:registrar).try(:name) ? x.object.try(:registrar).try(:name) : x.object_registry.try(:registrar).try(:name),
             x.id,
             dc.contactid
           ]
@@ -365,8 +365,8 @@ namespace :import do
             host.fqdn.try(:strip),
             ips[:ipv4].try(:strip),
             ips[:ipv6].try(:strip),
-            x.object_registry.try(:crid),
-            x.object.try(:upid) ? x.object.try(:upid) : x.object_registry.try(:crid),
+            user,
+            x.object.try(:registrar).try(:name) ? x.object.try(:registrar).try(:name) : x.object_registry.try(:registrar).try(:name),
             x.id
           ]
         end if x.nsset && x.nsset.hosts
@@ -380,7 +380,7 @@ namespace :import do
             3, # ds_alg
             1, # ds_digest_type /SHA1)
             user,
-            x.object.try(:upid) ? x.object.try(:upid) : x.object_registry.try(:crid),
+            x.object.try(:registrar).try(:name) ? x.object.try(:registrar).try(:name) : x.object_registry.try(:registrar).try(:name),
             x.id
           ]
         end