Your upstairs and downstairs lights should be on separate circuits, if the flickering is affecting both lighting circuits it is unlikely that you have a problem with the circuit wiring.
I have, on occasion, found that this kind of problem has been caused by loose meter tails and it may be worth...