diff --git a/app/models/item.rb b/app/models/item.rb
index 5c19f02b..ca6b4f8d 100644
--- a/app/models/item.rb
+++ b/app/models/item.rb
@@ -217,8 +217,7 @@ class Item < ActiveRecord::Base
     asset_registry.each_with_index do |asset_data, index|
       swf_asset_ids << index if asset_data
     end
-    existing_swf_assets = SwfAsset.find_all_by_id swf_asset_ids,
-      :conditions => {:type => SwfAssetType}
+    existing_swf_assets = SwfAsset.object_assets.find_all_by_id swf_asset_ids
     existing_swf_assets_by_id = {}
     existing_swf_assets.each do |swf_asset|
       existing_swf_assets_by_id[swf_asset.id] = swf_asset
diff --git a/app/models/pet_state.rb b/app/models/pet_state.rb
index d864d3be..a2750bad 100644
--- a/app/models/pet_state.rb
+++ b/app/models/pet_state.rb
@@ -63,7 +63,7 @@ class PetState < ActiveRecord::Base
           swf_asset_ids_str
         )
     end
-    existing_swf_assets = SwfAsset.find_all_by_id(swf_asset_ids)
+    existing_swf_assets = SwfAsset.biology_assets.find_all_by_id(swf_asset_ids)
     existing_swf_assets_by_id = {}
     existing_swf_assets.each do |swf_asset|
       existing_swf_assets_by_id[swf_asset.id] = swf_asset
diff --git a/app/models/swf_asset.rb b/app/models/swf_asset.rb
index 050c12a6..27c84d9d 100644
--- a/app/models/swf_asset.rb
+++ b/app/models/swf_asset.rb
@@ -20,7 +20,8 @@ class SwfAsset < ActiveRecord::Base
     where(arel_table[:body_id].in(BodyIdsFittingStandard))
   }
   
-  scope :object_assets, where(arel_table[:type].eq('object'))
+  scope :biology_assets, where(arel_table[:type].eq(PetState::SwfAssetType))
+  scope :object_assets, where(arel_table[:type].eq(Item::SwfAssetType))
   
   def local_url
     '/' + File.join(PUBLIC_ASSET_DIR, local_path_within_outfit_swfs)