It was Jenova, in the basement, with the Masamune.

Seriously, it really was Jenova; the script makes that fairly obvious.