Effect of oxygen on short-range order in the Ba1-xBixF2+x solid solution