diff: rename the file's 'oid' to 'id'

In the same vein as the previous commits in this series.