Move omni instantiation in read_source up one level