Remove oid_id field usage. Refs gh-185